Skip to content

Update #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nobu wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1722d4
Use $CPPFLAGS
nobu Jun 14, 2016
50286cc
Use macro for the feature
nobu Jun 14, 2016
089cd33
Use dedicated macros
nobu Jun 14, 2016
6b744df
Use `rb_block_given_p`
nobu Jun 14, 2016
965ec79
Remove extra semicolons
nobu Jun 14, 2016
e0d35bf
Protoize
nobu Jun 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ext/shadow/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

require 'mkmf'

$CFLAGS = RUBY_VERSION =~ /1\.8/ ? '-DRUBY18' : ''

if( ! (ok = have_library("shadow","getspent")) )
ok = have_func("getspent")
end
Expand All @@ -19,8 +17,6 @@
ok &= have_func("ulckpwdf")

if ok
if ! have_func("sgetspent")
$CFLAGS += '-DSOLARIS'
end
have_func("sgetspent")
create_makefile("shadow")
end
50 changes: 25 additions & 25 deletions ext/shadow/shadow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

#include <shadow.h>
#include "ruby.h"
#ifdef RUBY18
#ifndef HAVE_RUBY_IO_H
#include "rubyio.h"
#else
#include <ruby/io.h>
#endif

#ifdef RUBY18
#define file_ptr(x) (x)->f
#ifdef GetReadFile
#define file_ptr(x) GetReadFile(x)
#else
#define file_ptr(x) (x)->stdio_file
#define file_ptr(x) rb_io_stdio_file(x)
#endif

static VALUE rb_mShadow;
Expand All @@ -35,18 +35,18 @@ rb_shadow_setspent(VALUE self)
{
setspent();
return Qnil;
};
}


static VALUE
rb_shadow_endspent(VALUE self)
{
endspent();
return Qnil;
};
}


#ifndef SOLARIS
#ifdef HAVE_SGETSPENT
static VALUE
rb_shadow_sgetspent(VALUE self, VALUE str)
{
Expand Down Expand Up @@ -74,7 +74,7 @@ rb_shadow_sgetspent(VALUE self, VALUE str)
0);
free(entry);
return result;
};
}
#endif

static VALUE
Expand Down Expand Up @@ -103,7 +103,7 @@ rb_shadow_fgetspent(VALUE self, VALUE file)
INT2FIX(entry->sp_flag),
0);
return result;
};
}

static VALUE
rb_shadow_getspent(VALUE self)
Expand All @@ -128,7 +128,7 @@ rb_shadow_getspent(VALUE self)
INT2FIX(entry->sp_flag),
0);
return result;
};
}

static VALUE
rb_shadow_getspnam(VALUE self, VALUE name)
Expand Down Expand Up @@ -156,7 +156,7 @@ rb_shadow_getspnam(VALUE self, VALUE name)
INT2FIX(entry->sp_flag),
0);
return result;
};
}


static VALUE
Expand Down Expand Up @@ -188,7 +188,7 @@ rb_shadow_putspent(VALUE self, VALUE entry, VALUE file)
rb_raise(rb_eStandardError,"can't change password");

return Qtrue;
};
}


static VALUE
Expand All @@ -200,7 +200,7 @@ rb_shadow_lckpwdf(VALUE self)
rb_raise(rb_eFileLock,"password file was locked");
else
return Qtrue;
};
}

static int in_lock;

Expand All @@ -209,7 +209,7 @@ rb_shadow_lock(VALUE self)
{
int result;

if( rb_iterator_p() ){
if( rb_block_given_p() ){
result = lckpwdf();
if( result == -1 ){
rb_raise(rb_eFileLock,"password file was locked");
Expand All @@ -219,30 +219,30 @@ rb_shadow_lock(VALUE self)
rb_yield(Qnil);
in_lock--;
ulckpwdf();
};
}
return Qtrue;
}
else{
return rb_shadow_lckpwdf(self);
};
};
}
}


static VALUE
rb_shadow_ulckpwdf(VALUE self)
{
if( in_lock ){
rb_raise(rb_eFileLock,"you call unlock method in lock iterator.");
};
}
ulckpwdf();
return Qtrue;
};
}

static VALUE
rb_shadow_unlock(VALUE self)
{
return rb_shadow_ulckpwdf(self);
};
}

static VALUE
rb_shadow_lock_p(VALUE self)
Expand All @@ -256,12 +256,12 @@ rb_shadow_lock_p(VALUE self)
else{
ulckpwdf();
return Qfalse;
};
};
}
}


void
Init_shadow()
Init_shadow(void)
{
rb_sPasswdEntry = rb_struct_define("PasswdEntry",
"sp_namp","sp_pwdp","sp_lstchg",
Expand All @@ -280,7 +280,7 @@ Init_shadow()

rb_define_module_function(rb_mPasswd,"setspent",rb_shadow_setspent,0);
rb_define_module_function(rb_mPasswd,"endspent",rb_shadow_endspent,0);
#ifndef SOLARIS
#ifdef HAVE_SGETSPENT
rb_define_module_function(rb_mPasswd,"sgetspent",rb_shadow_sgetspent,1);
#endif
rb_define_module_function(rb_mPasswd,"fgetspent",rb_shadow_fgetspent,1);
Expand All @@ -292,4 +292,4 @@ Init_shadow()
rb_define_module_function(rb_mPasswd,"ulckpwdf",rb_shadow_ulckpwdf,0);
rb_define_module_function(rb_mPasswd,"unlock",rb_shadow_unlock,0);
rb_define_module_function(rb_mPasswd,"lock?",rb_shadow_lock_p,0);
};
}