diff options
| author | Rich Felker <dalias@aerifal.cx> | 2013-07-19 01:34:28 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-07-19 01:34:28 -0400 |
| commit | 648c3b4e18b2ce2b6af7d44783e42ca267ea49f5 (patch) | |
| tree | 1b57c9dfd2196639b331fb38c10aecf057dc733c /src | |
| parent | df065781ee913681ba86a636a2516cb0162cab19 (diff) | |
| download | musl-648c3b4e18b2ce2b6af7d44783e42ca267ea49f5.tar.gz | |
change uid_t, gid_t, and id_t to unsigned types
this change is both to fix one of the remaining type (and thus C++
ABI) mismatches with glibc/LSB and to allow use of the full range of
uid and gid values, if so desired.
passwd/group access functions were not prepared to deal with unsigned
values, so they too have been fixed with this commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/passwd/getgrent_a.c | 11 | ||||
| -rw-r--r-- | src/passwd/getpwent_a.c | 15 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/passwd/getgrent_a.c b/src/passwd/getgrent_a.c index 780560dd..2cb85215 100644 --- a/src/passwd/getgrent_a.c +++ b/src/passwd/getgrent_a.c @@ -1,6 +1,13 @@ #include "pwf.h" #include <pthread.h> +static unsigned atou(char **s) +{ + unsigned x; + for (x=0; **s-'0'<10U; ++*s) x=10*x+(**s-'0'); + return x; +} + struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem) { ssize_t l; @@ -24,8 +31,8 @@ struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, *s++ = 0; gr->gr_passwd = s; if (!(s = strchr(s, ':'))) continue; - *s++ = 0; gr->gr_gid = atoi(s); - if (!(s = strchr(s, ':'))) continue; + *s++ = 0; gr->gr_gid = atou(&s); + if (*s != ':') continue; *s++ = 0; mems = s; break; diff --git a/src/passwd/getpwent_a.c b/src/passwd/getpwent_a.c index 1bd7f4fc..34842a07 100644 --- a/src/passwd/getpwent_a.c +++ b/src/passwd/getpwent_a.c @@ -1,6 +1,13 @@ #include "pwf.h" #include <pthread.h> +static unsigned atou(char **s) +{ + unsigned x; + for (x=0; **s-'0'<10U; ++*s) x=10*x+(**s-'0'); + return x; +} + struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size) { ssize_t l; @@ -23,11 +30,11 @@ struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *siz *s++ = 0; pw->pw_passwd = s; if (!(s = strchr(s, ':'))) continue; - *s++ = 0; pw->pw_uid = atoi(s); - if (!(s = strchr(s, ':'))) continue; + *s++ = 0; pw->pw_uid = atou(&s); + if (*s != ':') continue; - *s++ = 0; pw->pw_gid = atoi(s); - if (!(s = strchr(s, ':'))) continue; + *s++ = 0; pw->pw_gid = atou(&s); + if (*s != ':') continue; *s++ = 0; pw->pw_gecos = s; if (!(s = strchr(s, ':'))) continue; |