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

* cygcheck.cc (pretty_id): Quote the path for popen. 

(dump_sysinfo_services): Ditto.
This commit is contained in:
Pierre Humblet 2008-12-31 01:44:36 +00:00
parent b837af5478
commit 0b451bb524
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-30 Pierre Humblet <Pierre.Humblet@ieee.org>
* cygcheck.cc (pretty_id): Quote the path for popen.
(dump_sysinfo_services): Ditto.
2008-12-16 Corinna Vinschen <corinna@vinschen.de> 2008-12-16 Corinna Vinschen <corinna@vinschen.de>
* utils.sgml: Fix typo in passwd screen text. * utils.sgml: Fix typo in passwd screen text.

11
winsup/utils/cygcheck.cc
View File

@ -1032,9 +1032,10 @@ pretty_id (const char *s, char *cygwin, size_t cyglen)
return; return;
} }
FILE *f = popen (id, "rt");
char buf[16384]; char buf[16384];
snprintf (buf, sizeof (buf), "\"%s\"", id);
FILE *f = popen (buf, "rt");
buf[0] = '\0'; buf[0] = '\0';
fgets (buf, sizeof (buf), f); fgets (buf, sizeof (buf), f);
pclose (f); pclose (f);
@ -1118,7 +1119,7 @@ dump_sysinfo_services ()
} }
/* check for a recent cygrunsrv */ /* check for a recent cygrunsrv */
snprintf (buf, sizeof (buf), "%s --version", cygrunsrv); snprintf (buf, sizeof (buf), "\"%s\" --version", cygrunsrv);
if ((f = popen (buf, "rt")) == NULL) if ((f = popen (buf, "rt")) == NULL)
{ {
printf ("Failed to execute '%s', skipping services check.\n", buf); printf ("Failed to execute '%s', skipping services check.\n", buf);
@ -1136,7 +1137,7 @@ dump_sysinfo_services ()
/* For verbose mode, just run cygrunsrv --list --verbose and copy output /* For verbose mode, just run cygrunsrv --list --verbose and copy output
verbatim; otherwise run cygrunsrv --list and then cygrunsrv --query for verbatim; otherwise run cygrunsrv --list and then cygrunsrv --query for
each service. */ each service. */
snprintf (buf, sizeof (buf), (verbose ? "%s --list --verbose" : "%s --list"), snprintf (buf, sizeof (buf), (verbose ? "\"%s\" --list --verbose" : "%s --list"),
cygrunsrv); cygrunsrv);
if ((f = popen (buf, "rt")) == NULL) if ((f = popen (buf, "rt")) == NULL)
{ {
@ -1167,7 +1168,7 @@ dump_sysinfo_services ()
if (nchars > 0) if (nchars > 0)
for (char *srv = strtok (buf, "\n"); srv; srv = strtok (NULL, "\n")) for (char *srv = strtok (buf, "\n"); srv; srv = strtok (NULL, "\n"))
{ {
snprintf (buf2, sizeof (buf2), "%s --query %s", cygrunsrv, srv); snprintf (buf2, sizeof (buf2), "\"%s\" --query %s", cygrunsrv, srv);
if ((f = popen (buf2, "rt")) == NULL) if ((f = popen (buf2, "rt")) == NULL)
{ {
printf ("Failed to execute '%s', skipping services check.\n", buf2); printf ("Failed to execute '%s', skipping services check.\n", buf2);