1 files changed, 8 insertions, 5 deletions
diff --git a/cpukit/libcsupport/src/getlogin.c b/cpukit/libcsupport/src/getlogin.c
index 8515a75ed5..f98e7ca9e0 100644
--- a/cpukit/libcsupport/src/getlogin.c
+++ b/cpukit/libcsupport/src/getlogin.c
@@ -41,6 +41,7 @@ int getlogin_r(
 )
 {
   struct passwd *pw;
+  char          *pname;
 
   if ( !name ) 
     return EFAULT;
@@ -48,11 +49,13 @@ int getlogin_r(
   if ( namesize < LOGIN_NAME_MAX )
     return ERANGE;
 
+  /* Set the pointer to a default name */
+  pname = "";
+
   pw = getpwuid(getuid());
-  if ( !pw ) {
-   strcpy( name, "" );
-  } else {
-   strncpy( name, pw->pw_name, LOGIN_NAME_MAX );
-  }
+  if ( pw )
+   pname = pw->pw_name;
+
+  strncpy( name, pname, LOGIN_NAME_MAX );
   return 0;
 }