libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* uinfo.cc (internal_getlogin): Set environment variable $HOME 

from either /etc/passwd or $HOMEDRIVE/$HOMEPATH if necessary.
This commit is contained in:
Corinna Vinschen 2001-10-29 11:53:52 +00:00
parent 711ded6d28
commit ac19c8dcf6
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2001-10-29 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (internal_getlogin): Set environment variable $HOME
from either /etc/passwd or $HOMEDRIVE/$HOMEPATH if necessary.
2001-10-29 Christopher Faylor <cgf@redhat.com>
* fhandler.h (fhandler_serial::fhandler_serial): Change to only accept

25
winsup/cygwin/uinfo.cc
View File

@ -33,6 +33,7 @@ details. */
struct passwd *
internal_getlogin (cygheap_user &user)
{
char buf[512];
char username[UNLEN + 1];
DWORD username_len = UNLEN + 1;
struct passwd *pw = NULL;
@ -47,7 +48,6 @@ internal_getlogin (cygheap_user &user)
{
LPWKSTA_USER_INFO_1 wui;
NET_API_STATUS ret;
char buf[512];
char *env;
user.set_logsrv (NULL);
@ -212,7 +212,28 @@ internal_getlogin (cygheap_user &user)
}
}
debug_printf ("Cygwins Username: %s", user.name ());
return pw ?: getpwnam(user.name ());
if (!pw)
pw = getpwnam(user.name ());
if (!getenv ("HOME"))
{
const char *homedrive, *homepath;
if (pw && pw->pw_dir && *pw->pw_dir)
{
setenv ("HOME", pw->pw_dir, 1);
debug_printf ("Set HOME (from /etc/passwd) to %s", pw->pw_dir);
}
else if ((homedrive = getenv ("HOMEDRIVE"))
&& (homepath = getenv ("HOMEPATH")))
{
char home[MAX_PATH];
strcpy (buf, homedrive);
strcat (buf, homepath);
cygwin_conv_to_full_posix_path (buf, home);
setenv ("HOME", home, 1);
debug_printf ("Set HOME (from HOMEDRIVE/HOMEPATH) to %s", home);
}
}
return pw;
}
void