From 7cda8e208f2c14373f36975efa55b022d642a2c8 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 6 Jun 2000 21:18:59 +0000
Subject: [PATCH] fixed user name exits test logic

---
 src/libCom/osi/os/posix/osdProcess.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/libCom/osi/os/posix/osdProcess.c b/src/libCom/osi/os/posix/osdProcess.c
index c5574d4fb..7ef0f3b57 100644
--- a/src/libCom/osi/os/posix/osdProcess.c
+++ b/src/libCom/osi/os/posix/osdProcess.c
@@ -24,17 +24,15 @@
 
 epicsShareFunc osiGetUserNameReturn epicsShareAPI osiGetUserName (char *pBuf, unsigned bufSizeIn)
 {
-    const char *pName;
     struct passwd *p;
 
     p = getpwuid ( getuid () );
-    if (p) {
-        pName = p->pw_name;
-        if (!pName) {
-            size_t len = strlen (pName);
+    if ( p ) {
+        if ( p->pw_name ) {
+            size_t len = strlen ( p->pw_name );
             unsigned uiLength;
 
-            if ( len>UINT_MAX || len<=0 ) {
+            if ( len > UINT_MAX || len <= 0 ) {
                 return osiGetUserNameFail;
             }
             uiLength = (unsigned) len;
@@ -43,7 +41,7 @@ epicsShareFunc osiGetUserNameReturn epicsShareAPI osiGetUserName (char *pBuf, un
                 return osiGetUserNameFail;
             }
 
-            strncpy ( pBuf, pName, (size_t) bufSizeIn );
+            strncpy ( pBuf, p->pw_name, (size_t) bufSizeIn );
 
             return osiGetUserNameSuccess;
         }