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 (cygheap_user::ontherange): Fix order of fallbacks creating 

HOMEDRIVE/HOMEPATH values to be Windows-compliant.  Add comments.
This commit is contained in:
Corinna Vinschen 2014-12-02 11:26:22 +00:00
parent 41f77e25f1
commit 4fe712cd80
2 changed files with 41 additions and 25 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 @@
2014-12-02 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (cygheap_user::ontherange): Fix order of fallbacks creating
HOMEDRIVE/HOMEPATH values to be Windows-compliant. Add comments.
2014-12-02 Corinna Vinschen <corinna@vinschen.de> 2014-12-02 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (CreateProfile): Import. * autoload.cc (CreateProfile): Import.

61
winsup/cygwin/uinfo.cc
View File

@ -320,9 +320,6 @@ cuserid (char *src)
const char * const char *
cygheap_user::ontherange (homebodies what, struct passwd *pw) cygheap_user::ontherange (homebodies what, struct passwd *pw)
{ {
PUSER_INFO_3 ui = NULL;
WCHAR wuser[UNLEN + 1];
NET_API_STATUS ret;
char homedrive_env_buf[3]; char homedrive_env_buf[3];
char *newhomedrive = NULL; char *newhomedrive = NULL;
char *newhomepath = NULL; char *newhomepath = NULL;
@ -353,42 +350,56 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
} }
} }
if (what != CH_HOME && homepath == NULL && newhomepath == NULL) if (what != CH_HOME && homepath == NULL)
{ {
WCHAR wuser[UNLEN + 1];
WCHAR wlogsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3];
PUSER_INFO_3 ui = NULL;
char *homepath_env_buf = tp.c_get (); char *homepath_env_buf = tp.c_get ();
if (!pw) WCHAR profile[MAX_PATH];
pw = internal_getpwnam (name ()); WCHAR win_id[UNLEN + 1]; /* Large enough for SID */
homepath_env_buf[0] = homepath_env_buf[1] = '\0';
/* Use Cygwin home as HOMEDRIVE/HOMEPATH in the first place. This
should cover it completely, in theory. Still, it might be the
wrong choice in the long run, which might demand to set HOMEDRIVE/
HOMEPATH to the correct values per Windows. Keep the entire rest
of the code mainly for this reason, so switching is easy. */
pw = internal_getpwsid (sid ());
if (pw && pw->pw_dir && *pw->pw_dir) if (pw && pw->pw_dir && *pw->pw_dir)
cygwin_conv_path (CCP_POSIX_TO_WIN_A, pw->pw_dir, homepath_env_buf, cygwin_conv_path (CCP_POSIX_TO_WIN_A, pw->pw_dir, homepath_env_buf,
NT_MAX_PATH); NT_MAX_PATH);
else /* First fallback: Windows path per Windows user DB. */
else if (logsrv ())
{ {
homepath_env_buf[0] = homepath_env_buf[1] = '\0'; sys_mbstowcs (wlogsrv, sizeof (wlogsrv) / sizeof (*wlogsrv),
if (logsrv ()) logsrv ());
sys_mbstowcs (wuser, sizeof wuser / sizeof *wuser, winname ());
if (NetUserGetInfo (wlogsrv, wuser, 3, (LPBYTE *) &ui)
== NERR_Success)
{ {
WCHAR wlogsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3]; if (ui->usri3_home_dir_drive && *ui->usri3_home_dir_drive)
sys_mbstowcs (wlogsrv, sizeof (wlogsrv) / sizeof (*wlogsrv),
logsrv ());
sys_mbstowcs (wuser, sizeof wuser / sizeof *wuser, winname ());
if (!(ret = NetUserGetInfo (wlogsrv, wuser, 3, (LPBYTE *) &ui)))
{ {
sys_wcstombs (homepath_env_buf, NT_MAX_PATH, sys_wcstombs (homepath_env_buf, NT_MAX_PATH,
ui->usri3_home_dir); ui->usri3_home_dir_drive);
if (!homepath_env_buf[0]) strcat (homepath_env_buf, "\\");
{
sys_wcstombs (homepath_env_buf, NT_MAX_PATH,
ui->usri3_home_dir_drive);
if (homepath_env_buf[0])
strcat (homepath_env_buf, "\\");
else
cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_ABSOLUTE,
"/", homepath_env_buf, NT_MAX_PATH);
}
} }
else if (ui->usri3_home_dir && *ui->usri3_home_dir)
sys_wcstombs (homepath_env_buf, NT_MAX_PATH,
ui->usri3_home_dir);
} }
if (ui) if (ui)
NetApiBufferFree (ui); NetApiBufferFree (ui);
} }
/* Second fallback: Windows profile dir. */
if (!homepath_env_buf[0]
&& get_user_profile_directory (get_windows_id (win_id),
profile, MAX_PATH))
sys_wcstombs (homepath_env_buf, NT_MAX_PATH, profile);
/* Last fallback: Cygwin root dir. */
if (!homepath_env_buf[0])
cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_ABSOLUTE,
"/", homepath_env_buf, NT_MAX_PATH);
if (homepath_env_buf[1] != ':') if (homepath_env_buf[1] != ':')
{ {