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

* cygcheck.cc (pretty_id): Rework slightly to not rely on spaces.

Browse Source
This commit is contained in:
Christopher Faylor 2003-06-13 02:36:12 +00:00
parent 8d60a6029c
commit 6806f4f6e2
2 changed files with 11 additions and 7 deletions

4
winsup/utils/ChangeLog

@ -1,3 +1,7 @@
2003-06-12 Christopher Faylor <cgf@redhat.com>
* cygcheck.cc (pretty_id): Rework slightly to not rely on spaces.
2003-06-12 Christopher Faylor <cgf@redhat.com> 2003-06-12 Christopher Faylor <cgf@redhat.com>
* cygpath.cc: Throughout, always return error when GetShortPathName * cygpath.cc: Throughout, always return error when GetShortPathName

14
winsup/utils/cygcheck.cc

@ -784,8 +784,8 @@ pretty_id (const char *s, char *cygwin, size_t cyglen)
char buf[16384]; char buf[16384];
fgets (buf, sizeof (buf), f); fgets (buf, sizeof (buf), f);
char *uid = strtok (buf, " ") + sizeof ("uid=") - 1; char *uid = strtok (buf, ")") + strlen ("uid=");
char *gid = strtok (NULL, " ") + sizeof ("gid=") - 1; char *gid = strtok (NULL, ")") + strlen ("gid=") + 1;
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++)
@ -794,21 +794,21 @@ pretty_id (const char *s, char *cygwin, size_t cyglen)
if (p) if (p)
*p = '\0'; *p = '\0';
if (ng == groups) if (ng == groups)
*ng += sizeof ("groups=") - 1; *ng += strlen (" groups=");
size_t len = strlen (*ng); size_t len = strlen (*ng);
if (sz < len) if (sz < len)
sz = len; sz = len;
} }
printf ("\n%s output (%s)\n", id, s); printf ("\nOutput from %s (%s)\n", id, s);
int szmaybe = sizeof ("UID: ") + strlen (uid) - 1; int szmaybe = strlen ("UID: ") + strlen (uid);
if (sz < szmaybe) if (sz < szmaybe)
sz = szmaybe; sz = szmaybe;
sz += 1; sz += 1;
int n = 80 / (int) sz; int n = 80 / (int) sz;
sz = -sz; sz = -sz;
ng[0] += sizeof ("groups=") - 1; ng[0] += strlen ("groups=");
printf ("UID: %*s GID: %s\n", sz + (sizeof ("UID: ") - 1), uid, gid); printf ("UID: %.*s) GID: %s)\n", sz + (sizeof ("UID: ") - 1), uid, gid);
int i = 0; int i = 0;
for (char **g = groups; g < ng; g++) for (char **g = groups; g < ng; g++)
{ {