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

* cygcheck.cc (load_cygwin): Make half-hearted attempt to work with older DLLs.

Browse Source 
* strace.cc (load_cygwin): Ditto.
This commit is contained in:
Christopher Faylor 2005-05-27 15:45:53 +00:00
parent 720c77ee72
commit cba3b11fc5
3 changed files with 39 additions and 34 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-05-27 Christopher Faylor <cgf@timesys.com>
* cygcheck.cc (load_cygwin): Make half-hearted attempt to work with
older DLLs.
* strace.cc (load_cygwin): Ditto.
2005-05-22 Brian Dessent <brian@dessent.net> 2005-05-22 Brian Dessent <brian@dessent.net>
* cygcheck.cc (dump_sysinfo_services): Add new function that uses * cygcheck.cc (dump_sysinfo_services): Add new function that uses

5
winsup/utils/cygcheck.cc
View File

@ -929,7 +929,6 @@ dump_sysinfo_services ()
return; return;
} }
/* In verbose mode, just run 'cygrunsrv --list --verbose' and copy the /* In verbose mode, just run 'cygrunsrv --list --verbose' and copy the
entire output. Otherwise run 'cygrunsrv --query' for each service. */ entire output. Otherwise run 'cygrunsrv --query' for each service. */
for (char *srv = strtok (buf, "\n"); srv; srv = strtok (NULL, "\n")) for (char *srv = strtok (buf, "\n"); srv; srv = strtok (NULL, "\n"))
@ -1552,12 +1551,12 @@ load_cygwin (int& argc, char **&argv)
return; return;
char **av = (char **) cygwin_internal (CW_ARGV); char **av = (char **) cygwin_internal (CW_ARGV);
if (av) if (av && ((DWORD) av != (DWORD) -1))
for (argc = 0, argv = av; *av; av++) for (argc = 0, argv = av; *av; av++)
argc++; argc++;
char **envp = (char **) cygwin_internal (CW_ENVP); char **envp = (char **) cygwin_internal (CW_ENVP);
if (envp) if (envp && ((DWORD) envp != (DWORD) -1))
{ {
/* Store path and revert to this value, otherwise path gets overwritten /* Store path and revert to this value, otherwise path gets overwritten
by the POSIXy Cygwin variation, which breaks cygcheck. by the POSIXy Cygwin variation, which breaks cygcheck.

2
winsup/utils/strace.cc
View File

@ -909,7 +909,7 @@ main (int argc, char **argv)
if (load_cygwin ()) if (load_cygwin ())
{ {
char **av = (char **) cygwin_internal (CW_ARGV); char **av = (char **) cygwin_internal (CW_ARGV);
if (av) if (av && (DWORD) av != (DWORD) -1)
for (argc = 0, argv = av; *av; av++) for (argc = 0, argv = av; *av; av++)
argc++; argc++;
} }