sys-admin 1.4.1 → 1.4.2

data/CHANGES

@@ -1,3 +1,11 @@
+== 1.4.2 - 26-Jun-2007
+* Fixed a bug in the Admin.get_login method where it would return junk
+  if the underlying getlogin() function failed (Unix). Thanks go to Gonzalo
+  Garramuno for the spot. This bug also resulted in some refactoring of the
+  underlying C code.
+* Removed the install.rb file. The logic in that file has been moved directly
+  into the Rakefile.
+
 == 1.4.1 - 21-Mar-2007
 * Bug fix for OS X. Thanks go to an anonymous user for the spot.
 * Added a Rakefile. Building, testing and installing should now use the

data/MANIFEST

@@ -1,19 +1,14 @@
-* install.rb
 * sys-admin.gemspec
 * CHANGES
 * MANIFEST
 * Rakefile
 * README
-
 * examples/groups.rb
 * examples/users.rb
-
 * ext/admin.c
 * ext/admin.h
 * ext/extconf.rb
-
-* lib/sys/win32.rb
-
+* lib/sys/admin.rb
 * test/tc_admin.rb
 * test/tc_unix.rb
-* test/tc_windows.rb
+* test/tc_windows.rb

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
+require 'rbconfig'
+include Config
 
 desc "Clean the build files for the sys-admin source for UNIX systems"
 task :clean do
@@ -27,12 +29,14 @@ task :build => [:clean] do
 end
 
 if RUBY_PLATFORM.match('mswin')
-   desc "Install the sys-admin package"
+   desc "Install the sys-admin package for MS Windows"
    task :install do
-      sh 'ruby install.rb'
+      install_dir = File.join(CONFIG['sitelibdir'], 'sys')
+      Dir.mkdir(install_dir) unless File.exists?(install_dir)
+      FileUtils.cp('lib/sys/admin.rb', install_dir, :verbose => true)
    end
 else
-   desc "Install the sys-admin package"
+   desc "Install the sys-admin package for Unix platforms"
    task :install => [:build] do
       Dir.chdir('ext') do
          sh 'make install'

data/ext/admin.c

@@ -39,42 +39,64 @@ static VALUE group_init(VALUE self){
  * call-seq:
  *    Sys::Admin.get_login
  *
- * Returns the login for the process.  If this is called from a process that
- * has no controlling terminal, then it resorts to returning the "USER"
- * environment variable.  If that still isn't defined, nil is returned.
+ * Returns the login for the process. If this is called from a process that
+ * has no controlling terminal, then it resorts to returning the "LOGNAME" or
+ * "USER" environment variable.  If neither of those is defined, then nil
+ * is returned.
  *
- *--
- * Developer's Note:
- * 
- * Uses the (POSIX) reentrant version of getlogin_r() if supported.  Otherwise
- * it resorts to the standard getlogin() function. If that fails, it resorts
- * to cuserid(). If that fails, it resorts to getenv("USER"). If that fails,
- * then nil is returned.
+ * Note that this method will _probably_ return the real user login, but may
+ * return the effective user login. YMMV depending on your platform and how
+ * the program is run.
  */
 static VALUE admin_get_login(VALUE klass){
-   char login[_POSIX_LOGIN_NAME_MAX];
    VALUE v_login = Qnil;
 
 #ifdef HAVE_GETLOGIN_R
-   getlogin_r(login, sizeof(login));
+   char login[_POSIX_LOGIN_NAME_MAX];
+
+   if(!getlogin_r(login, _POSIX_LOGIN_NAME_MAX))
+      return rb_str_new2(login);
 #elif HAVE_GETLOGIN
-   strcpy(login, getlogin());
+   char* login = getlogin();
+
+   if(login)
+      return rb_str_new2(login);
 #endif
 
-#ifdef HAVE_CUSERID
-   if(!login)
-      cuserid(login);
+#ifdef HAVE_GETPWUID_R
+   uid_t uid;
+   char buf[USER_BUF_SIZE];
+   struct passwd pwd;
+   struct passwd* pwdbuf;
+
+   uid = getuid();
+
+   if(getpwuid_r(uid, &pwd, buf, USER_BUF_SIZE, &pwdbuf) != 0)
+      return rb_str_new2(pwdbuf->pw_name);
+#elif HAVE_GETPWUID
+   uid_t uid;
+   struct passwd* pwd;
+
+   uid = getuid();
+
+   if((pwd = getpwuid(uid)))
+      return rb_str_new2(pwd->pw_name);
 #endif
 
 #ifdef HAVE_GETENV
-   if(!login)
-      strcpy(login, getenv("USER"));
-#endif
+   char* user = getenv("LOGNAME");
 
-   if(login)
-      v_login = rb_str_new2(login);
+   if(user){
+      return rb_str_new2(user);
+   }
+   else{
+      user = getenv("USER");
+      if(user)
+         return rb_str_new2(user);
+   }
+#endif
 
-   return v_login;
+   return Qnil;
 }
 
 /* call-seq:

data/ext/admin.h

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define SYS_ADMIN_VERSION "1.4.1"
+#define SYS_ADMIN_VERSION "1.4.2"
 
 #ifdef HAVE_LASTLOG_H
 #include <lastlog.h>

data/ext/extconf.rb

@@ -1,8 +1,8 @@
 require "mkmf"
 
 if RUBY_PLATFORM.match('mswin')
-   STDERR.puts "Use the install.rb file on Win32 systems."
-   STDERR.puts "Exiting.  The sys-admin package was NOT installed."
+   STDERR.puts "Use the 'rake install' task to install on MS Windows."
+   STDERR.puts "Exiting. The sys-admin package was NOT installed."
    exit
 else
    dir_config('admin')
@@ -11,8 +11,6 @@ else
    have_func("getlogin")
    have_func("getenv")
    
-   have_func("cuserid")
-   
    have_func("getpwuid_r")
    have_func("getpwuid")
    have_func("getpwnam_r")

data/test/tc_unix.rb

@@ -17,7 +17,7 @@ class TC_Sys_Admin_Unix < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.4.1", Admin::VERSION)
+      assert_equal("1.4.2", Admin::VERSION)
    end
 
    def test_get_login

data/test/tc_windows.rb

@@ -24,7 +24,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.4.1", Admin::VERSION)
+      assert_equal("1.4.2", Admin::VERSION)
    end
    
    def test_01_add_local_user

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: sys-admin
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
-date: 2007-03-22 00:00:00 -06:00
+  version: 1.4.2
+date: 2007-06-26 00:00:00 -06:00
 summary: A unified, cross platform replacement for the "etc" package.
 require_paths: 
 - lib
@@ -38,9 +38,9 @@ files:
 - MANIFEST
 - README
 - Rakefile
-- ext/extconf.rb
 - ext/admin.c
 - ext/admin.h
+- ext/extconf.rb
 test_files: 
 - test/tc_admin.rb
 rdoc_options: []