summary refs log tree commit diff
path: root/sysdeps/posix/cuserid.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/posix/cuserid.c')
-rw-r--r--sysdeps/posix/cuserid.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/sysdeps/posix/cuserid.c b/sysdeps/posix/cuserid.c
index 140442fdee..3108a46c21 100644
--- a/sysdeps/posix/cuserid.c
+++ b/sysdeps/posix/cuserid.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include <pwd.h>
 #include <stdio.h>
@@ -30,9 +30,11 @@ cuserid (s)
      char *s;
 {
   static char name[L_cuserid];
-  struct passwd *pwent = getpwuid (geteuid ());
+  char buf[NSS_BUFLEN_PASSWD];
+  struct passwd pwent;
+  struct passwd *pwptr;
 
-  if (pwent == NULL)
+  if (__getpwuid_r (geteuid (), &pwent, buf, sizeof (buf), &pwptr))
     {
       if (s != NULL)
 	s[0] = '\0';
@@ -41,5 +43,5 @@ cuserid (s)
 
   if (s == NULL)
     s = name;
-  return strcpy (s, pwent->pw_name);
+  return strncpy (s, pwptr->pw_name, L_cuserid);
 }