JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygheap.h (cygheap_user): Add static members to hold home{drive,path} info.

Browse Source 
* uinfo.cc (cygheap_user::ontherange): Use static class members for local HOME*
storage.
This commit is contained in:
Christopher Faylor
2002-06-14 20:36:42 +00:00
parent 9a771b2961
commit a77d35f7d2
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,10 @@
2002-06-14 Christopher Faylor <cgf@redhat.com>
* cygheap.h (cygheap_user): Add static members to hold home{drive,path}
info.
* uinfo.cc (cygheap_user::ontherange): Use static class members for
local HOME* storage.
2002-06-14 Christopher Faylor <cgf@redhat.com>
* cygheap.cc (cygheap_user::set_logsrv): Remove.

4
winsup/cygwin/cygheap.h
View File

@@ -105,6 +105,10 @@ class cygheap_user
char *homepath; /* User's home path */
PSID psid; /* buffer for user's SID */
PSID orig_psid; /* Remains intact even after impersonation */
static char homedrive_env_buf[3]; /* Where the HOMEDRIVE environment variable
info may live. */
static char homepath_env_buf[MAX_PATH + 1]; /* Where the HOMEPATH environment
variable info may live. */
public:
__uid32_t orig_uid; /* Remains intact even after impersonation */
__gid32_t orig_gid; /* Ditto */

51
winsup/cygwin/uinfo.cc
View File

@@ -188,11 +188,12 @@ cuserid (char *src)
return src;
}
char cygheap_user::homepath_env_buf[MAX_PATH + 1];
char cygheap_user::homedrive_env_buf[3];
const char *
cygheap_user::ontherange (homebodies what, struct passwd *pw)
{
static char buf[MAX_PATH + 1];
static char homedrive_buf[3];
LPUSER_INFO_3 ui = NULL;
WCHAR wuser[UNLEN + 1];
NET_API_STATUS ret;
@@ -202,13 +203,13 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
char *p;
if ((p = getenv ("HOMEDRIVE")))
{
memcpy (homedrive_buf, p, 2);
homedrive = homedrive_buf;
memcpy (homedrive_env_buf, p, 2);
homedrive = homedrive_env_buf;
}
if ((p = getenv ("HOMEPATH")))
{
strcpy (buf, p);
homepath = buf;
strcpy (homepath_env_buf, p);
homepath = homepath_env_buf;
}
if ((p = getenv ("HOME")))
debug_printf ("HOME is already in the environment %s", p);
@@ -224,6 +225,7 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
else if (homedrive && homepath)
{
char home[MAX_PATH];
char buf[MAX_PATH + 1];
strcpy (buf, homedrive);
strcat (buf, homepath);
cygwin_conv_to_full_posix_path (buf, home);
@@ -238,7 +240,7 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
if (!pw)
pw = getpwnam (name ());
if (pw && pw->pw_dir && *pw->pw_dir)
cygwin_conv_to_full_win32_path (pw->pw_dir, buf);
cygwin_conv_to_full_win32_path (pw->pw_dir, homepath_env_buf);
else
{
sys_mbstowcs (wuser, name (), sizeof (wuser) / sizeof (*wuser));
@@ -247,23 +249,24 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
if (env_logsrv ())
{
WCHAR wlogsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3];
strcpy (buf, env_logsrv ());
sys_mbstowcs (wlogsrv, buf, sizeof (wlogsrv) / sizeof(*wlogsrv));
strcpy (homepath_env_buf, env_logsrv ());
sys_mbstowcs (wlogsrv, homepath_env_buf,
sizeof (wlogsrv) / sizeof(*wlogsrv));
ret = NetUserGetInfo (wlogsrv, wuser, 3,(LPBYTE *)&ui);
}
}
if (!ret)
{
char *p;
sys_wcstombs (buf, ui->usri3_home_dir, MAX_PATH);
if (!buf[0])
sys_wcstombs (homepath_env_buf, ui->usri3_home_dir, MAX_PATH);
if (!homepath_env_buf[0])
{
sys_wcstombs (buf, ui->usri3_home_dir_drive, MAX_PATH);
if (buf[0])
strcat (buf, "\\");
else if (!GetSystemDirectory (buf, MAX_PATH))
strcpy (buf, "c:\\");
else if ((p = strchr (buf, '\\')))
sys_wcstombs (homepath_env_buf, ui->usri3_home_dir_drive, MAX_PATH);
if (homepath_env_buf[0])
strcat (homepath_env_buf, "\\");
else if (!GetSystemDirectory (homepath_env_buf, MAX_PATH))
strcpy (homepath_env_buf, "c:\\");
else if ((p = strchr (homepath_env_buf, '\\')))
p[1] = '\0';
}
}
@@ -271,18 +274,18 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw)
NetApiBufferFree (ui);
}
if (buf[1] != ':')
if (homepath_env_buf[1] != ':')
{
homedrive_buf[0] = homedrive_buf[1] = '\0';
homepath = buf;
homedrive_env_buf[0] = homedrive_env_buf[1] = '\0';
homepath = homepath_env_buf;
}
else
{
homedrive_buf[0] = buf[0];
homedrive_buf[1] = buf[1];
homepath = buf + 2;
homedrive_env_buf[0] = homepath_env_buf[0];
homedrive_env_buf[1] = homepath_env_buf[1];
homepath = homepath_env_buf + 2;
}
homedrive = homedrive_buf;
homedrive = homedrive_env_buf;
}
switch (what)