From b5e1ec76321ff83c3fea18155ff3440eaa344b54 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 1 Jul 2002 16:37:46 +0000 Subject: [PATCH] * debug.cc (threads): Avoid initialization. * uinfo.cc (cygheap_user::ontherange): (from Corinna Vinschen) Actually make below changes work. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/debug.cc | 2 +- winsup/cygwin/uinfo.cc | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ba0f44e27..2aa1a05fd 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2002-07-01 Christopher Faylor + + * debug.cc (threads): Avoid initialization. + * uinfo.cc (cygheap_user::ontherange): (from Corinna Vinschen) Actually + make below changes work. + 2002-07-01 Christopher Faylor * uinfo.cc (cygheap_user::ontherange): Make cygwin root the last resort diff --git a/winsup/cygwin/debug.cc b/winsup/cygwin/debug.cc index 5d3d63bbc..a530c5c34 100644 --- a/winsup/cygwin/debug.cc +++ b/winsup/cygwin/debug.cc @@ -31,7 +31,7 @@ typedef struct const char *name; } thread_info; -static NO_COPY thread_info threads[32] = {{0, NULL}}; // increase as necessary +static NO_COPY thread_info threads[32]; // increase as necessary #define NTHREADS (sizeof (threads) / sizeof (threads[0])) void diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 2e7f65c93..ec0420cc1 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -257,7 +257,6 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw) sys_mbstowcs (wuser, winname (), sizeof (wuser) / sizeof (*wuser)); if (!(ret = NetUserGetInfo (wlogsrv, wuser, 3,(LPBYTE *)&ui))) { - char *p; sys_wcstombs (homepath_env_buf, ui->usri3_home_dir, MAX_PATH); if (!homepath_env_buf[0]) { @@ -266,7 +265,7 @@ cygheap_user::ontherange (homebodies what, struct passwd *pw) if (homepath_env_buf[0]) strcat (homepath_env_buf, "\\"); else - cygwin_conv_to_full_posix_path (homepath_env_buf, "/"); + cygwin_conv_to_full_win32_path ("/", homepath_env_buf); } } }