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

* cygcheck.cc (init_paths): Use full path instead of "." for the 

current directory.  Do not add "." if present in $PATH.
	(dump_sysinfo): Skip placeholder first value of paths[].
This commit is contained in:
Corinna Vinschen 2005-03-24 14:48:15 +00:00
parent b832c4cf21
commit 0f0595abd9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@ -1,3 +1,9 @@
2005-03-24 Brian Dessent <brian@dessent.net>
* cygcheck.cc (init_paths): Use full path instead of "." for the
current directory. Do not add "." if present in $PATH.
(dump_sysinfo): Skip placeholder first value of paths[].
2005-03-07 Christopher Faylor <cgf@timesys.com> 2005-03-07 Christopher Faylor <cgf@timesys.com>
* kill.cc (getsig): Rectify bug introduced by 2005-02-26 change. Don't * kill.cc (getsig): Rectify bug introduced by 2005-02-26 change. Don't

12
winsup/utils/cygcheck.cc
View File

@ -158,7 +158,12 @@ init_paths ()
{ {
char tmp[4000], *sl; char tmp[4000], *sl;
add_path ((char *) ".", 1); /* to be replaced later */ add_path ((char *) ".", 1); /* to be replaced later */
add_path ((char *) ".", 1); /* the current directory */
if (GetCurrentDirectory (4000, tmp))
add_path (tmp, strlen (tmp));
else
display_error ("init_paths: GetCurrentDirectory()");
if (GetSystemDirectory (tmp, 4000)) if (GetSystemDirectory (tmp, 4000))
add_path (tmp, strlen (tmp)); add_path (tmp, strlen (tmp));
else else
@ -180,7 +185,8 @@ init_paths ()
while (1) while (1)
{ {
for (e = b; *e && *e != ';'; e++); for (e = b; *e && *e != ';'; e++);
add_path (b, e - b); if (strncmp(b, ".", 1) && strncmp(b, ".\\", 2))
add_path (b, e - b);
if (!*e) if (!*e)
break; break;
b = e + 1; b = e + 1;
@ -1237,7 +1243,7 @@ dump_sysinfo ()
if (givehelp) if (givehelp)
printf ("Looking for various Cygnus DLLs... (-v gives version info)\n"); printf ("Looking for various Cygnus DLLs... (-v gives version info)\n");
int cygwin_dll_count = 0; int cygwin_dll_count = 0;
for (i = 0; i < num_paths; i++) for (i = 1; i < num_paths; i++)
{ {
WIN32_FIND_DATA ffinfo; WIN32_FIND_DATA ffinfo;
sprintf (tmp, "%s/*.*", paths[i]); sprintf (tmp, "%s/*.*", paths[i]);