diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-28 23:45:57 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-28 23:45:57 +0000 |
| commit | b21b8fc9dfe18ea84811b6ddf65fcad7c6429275 (patch) | |
| tree | 6eaf2691ec388ebd43152436dfa9a48de794962c /user/unix | |
| parent | c2bf6ce9ec56f9a2a0e52c7411c1d0e0689536cc (diff) | |
| download | libapr-b21b8fc9dfe18ea84811b6ddf65fcad7c6429275.tar.gz | |
Moving a small OS2'ism into APR, it's pw_dir excludes the username.
Return the expected result. Also noted the headers/os2errno changes
from early this morning.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61164 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'user/unix')
| -rw-r--r-- | user/unix/userinfo.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/user/unix/userinfo.c b/user/unix/userinfo.c index b5b7ad397..38ed8d5c0 100644 --- a/user/unix/userinfo.c +++ b/user/unix/userinfo.c @@ -76,7 +76,12 @@ APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, const char *use #endif return errno; } +#ifdef OS2 + /* Need to manually add user name for OS/2 */ + *dirname = apr_pstrcat(p, pw->pw_dir, pw->pw_name, NULL); +#else *dirname = apr_pstrdup(p, pw->pw_dir); +#endif return APR_SUCCESS; } |