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

* cygcheck.cc (pretty_id): Make more robust in absence of id.exe.

Browse Source
This commit is contained in:
Christopher Faylor 2004-01-23 23:04:27 +00:00
parent f892e76346
commit 7dddf53f5c
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/utils/ChangeLog
View File

@ -1,3 +1,7 @@
2004-01-23 Christopher Faylor <cgf@redhat.com>
* cygcheck.cc (pretty_id): Make more robust in absence of id.exe.
2004-01-22 Corinna Vinschen <corinna@vinschen.de> 2004-01-22 Corinna Vinschen <corinna@vinschen.de>
* cygpath.cc (dowin): Revert accidental checkin from November. * cygpath.cc (dowin): Revert accidental checkin from November.

19
winsup/utils/cygcheck.cc
View File

@ -780,14 +780,27 @@ pretty_id (const char *s, char *cygwin, size_t cyglen)
*p = '\\'; *p = '\\';
if (access (id, X_OK)) if (access (id, X_OK))
fprintf (stderr, "`id' program not found\n"); {
fprintf (stderr, "`id' program not found\n");
return;
}
FILE *f = popen (id, "rt"); FILE *f = popen (id, "rt");
char buf[16384]; char buf[16384];
static char empty[] = "";
buf[0] = '\0';
fgets (buf, sizeof (buf), f); fgets (buf, sizeof (buf), f);
char *uid = strtok (buf, ")") + strlen ("uid="); char *uid = strtok (buf, ")");
char *gid = strtok (NULL, ")") + strlen ("gid=") + 1; if (uid)
uid += strlen ("uid=");
else
uid = empty;
char *gid = strtok (NULL, ")");
if (gid)
gid += strlen ("gid=") + 1;
else
gid = empty;
char **ng; char **ng;
size_t sz = 0; size_t sz = 0;
for (ng = groups; (*ng = strtok (NULL, ",")); ng++) for (ng = groups; (*ng = strtok (NULL, ",")); ng++)