1 files changed, 92 insertions, 63 deletions

diff --git a/c/src/lib/libc/getpwent.c b/c/src/lib/libc/getpwent.c
index 23a35f49bd..daa5d226f1 100644
--- a/c/src/lib/libc/getpwent.c
+++ b/c/src/lib/libc/getpwent.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <limits.h>
 
-static struct passwd pw_passwd;	/* password structure */
+static struct passwd pw_passwd;  /* password structure */
 static FILE *passwd_fp;
 
 static char logname[8];
@@ -17,78 +17,109 @@ static char gecos[1024];
 static char dir[1024];
 static char shell[1024];
 
-struct passwd *
-getpwnam (name)
-     const char *name;
+int getpwnam_r(
+  const char     *name,
+  struct passwd  *pwd,
+  char           *buffer,
+  size_t          bufsize,
+  struct passwd **result
+)
 {
   FILE *fp;
-  int uid, gid;
-  char buf[1024];
-
-  if ((fp = fopen ("/etc/passwd", "r")) == NULL)
-    {
-      return NULL;
-    }
 
-  while (fgets (buf, sizeof (buf), fp))
-    {
-      sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n",
-	      logname, password, &pw_passwd.pw_uid,
-	      &pw_passwd.pw_gid, comment, gecos,
-	      dir, shell);
-      pw_passwd.pw_name = logname;
-      pw_passwd.pw_passwd = password;
-      pw_passwd.pw_comment = comment;
-      pw_passwd.pw_gecos = gecos;
-      pw_passwd.pw_dir = dir;
-      pw_passwd.pw_shell = shell;
-
-      if (!strcmp (logname, name))
-	{
-	  fclose (fp);
-	  return &pw_passwd;
-	}
+  if ((fp = fopen ("/etc/passwd", "r")) == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  while (fgets (buffer, bufsize, fp)) {
+    sscanf (buffer, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n",
+        logname, password, &pwd->pw_uid,
+        &pwd->pw_gid, comment, gecos,
+        dir, shell);
+    pwd->pw_name = logname;
+    pwd->pw_passwd = password;
+    pwd->pw_comment = comment;
+    pwd->pw_gecos = gecos;
+    pwd->pw_dir = dir;
+    pwd->pw_shell = shell;
+
+    if (!strcmp (logname, name)) {
+      fclose (fp);
+      *result = pwd;
+      return 0;
     }
+  }
   fclose (fp);
-  return NULL;
+  errno = EINVAL;
+  return -1;
 }
 
-struct passwd *
-getpwuid (uid_t uid)
+struct passwd *getpwnam(
+  const char *name
+)
 {
-  FILE *fp;
-  char buf[1024];
+  char   buf[1024];
+  struct passwd *p;
 
-  if ((fp = fopen ("/etc/passwd", "r")) == NULL)
-    {
-      return NULL;
-    }
+  if ( getpwnam_r( name, &pw_passwd, buf, 1024, &p ) )
+    return NULL;
+
+  return p;
+}
 
-  while (fgets (buf, sizeof (buf), fp))
-    {
-      sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n",
-	      logname, password, &pw_passwd.pw_uid,
-	      &pw_passwd.pw_gid, comment, gecos,
-	      dir, shell);
-      pw_passwd.pw_name = logname;
-      pw_passwd.pw_passwd = password;
-      pw_passwd.pw_comment = comment;
-      pw_passwd.pw_gecos = gecos;
-      pw_passwd.pw_dir = dir;
-      pw_passwd.pw_shell = shell;
-
-      if (uid == pw_passwd.pw_uid)
-	{
-	  fclose (fp);
-	  return &pw_passwd;
-	}
+int getpwuid_r(
+  uid_t           uid,
+  struct passwd  *pwd,
+  char           *buffer,
+  size_t          bufsize,
+  struct passwd **result
+)
+{
+  FILE *fp;
+
+  if ((fp = fopen ("/etc/passwd", "r")) == NULL) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  while (fgets (buffer, bufsize, fp)) {
+    sscanf (buffer, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n",
+     logname, password, &pw_passwd.pw_uid,
+     &pw_passwd.pw_gid, comment, gecos,
+     dir, shell);
+    pwd->pw_name = logname;
+    pwd->pw_passwd = password;
+    pwd->pw_comment = comment;
+    pwd->pw_gecos = gecos;
+    pwd->pw_dir = dir;
+    pwd->pw_shell = shell;
+
+    if (uid == pwd->pw_uid) {
+      fclose (fp);
+      *result = pwd;
+      return 0;
     }
+  }
   fclose (fp);
-  return NULL;
+  errno = EINVAL;
+  return -1;
+}
+
+struct passwd *getpwuid(
+  uid_t uid
+)
+{
+  char   buf[1024];
+  struct passwd *p;
+
+  if ( getpwuid_r( uid, &pw_passwd, buf, 1024, &p ) )
+    return NULL;
+
+  return p;
 }
 
-struct passwd *
-getpwent ()
+struct passwd *getpwent()
 {
   char buf[1024];
 
@@ -112,8 +143,7 @@ getpwent ()
   return &pw_passwd;
 }
 
-void
-setpwent ()
+void setpwent( void )
 {
   if (passwd_fp != NULL)
     fclose (passwd_fp);
@@ -121,8 +151,7 @@ setpwent ()
   passwd_fp = fopen ("/etc/passwd", "r");
 }
 
-void
-endpwent ()
+void endpwent( void )
 {
   if (passwd_fp != NULL)
     fclose (passwd_fp);