diff options
| -rw-r--r-- | polyp/util.c | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/polyp/util.c b/polyp/util.c index 2ac55402..9e8dc5e2 100644 --- a/polyp/util.c +++ b/polyp/util.c @@ -264,22 +264,22 @@ char *pa_get_user_name(char *s, size_t l) {  #ifdef HAVE_GETPWUID_R          if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {  #else -            /* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X) -             * that do not support getpwuid_r. */ -            if ((r = getpwuid(getuid())) == NULL) { +        /* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X) +            * that do not support getpwuid_r. */ +        if ((r = getpwuid(getuid())) == NULL) {  #endif -                snprintf(s, l, "%lu", (unsigned long) getuid()); -                return s; -            } -             -            p = r->pw_name; +            snprintf(s, l, "%lu", (unsigned long) getuid()); +            return s; +        } +         +        p = r->pw_name;  #else /* HAVE_PWD_H */ -            return NULL; +        return NULL;  #endif /* HAVE_PWD_H */ -        } +    }      return pa_strlcpy(s, p, l); -    } +}  /* Return the current hostname in the specified buffer. */  char *pa_get_host_name(char *s, size_t l) {  | 
