diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 15:10:57 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 15:10:57 +0000 |
| commit | 7fe677c6d31a6fd854eaf64609d72b8613ca36ea (patch) | |
| tree | 4c65df7c08e0730d0686b169545be93177080810 /libc/pwd_grp/pwd_grp.c | |
| parent | eb853014235c86b33318f16e205ff2f818e5a67c (diff) | |
| download | uClibc-alpine-7fe677c6d31a6fd854eaf64609d72b8613ca36ea.tar.bz2 uClibc-alpine-7fe677c6d31a6fd854eaf64609d72b8613ca36ea.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/pwd_grp/pwd_grp.c')
| -rw-r--r-- | libc/pwd_grp/pwd_grp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c index ced5051f8..82c99360a 100644 --- a/libc/pwd_grp/pwd_grp.c +++ b/libc/pwd_grp/pwd_grp.c @@ -19,6 +19,8 @@ */ #define setgroups __setgroups +#define strtoul __strtoul +#define rewind __rewind #define _GNU_SOURCE #include <features.h> @@ -433,7 +435,7 @@ int getpw(uid_t uid, char *buf) if (!buf) { __set_errno(EINVAL); } else if (!__getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result)) { - if (sprintf(buf, "%s:%s:%lu:%lu:%s:%s:%s\n", + if (__sprintf(buf, "%s:%s:%lu:%lu:%s:%s:%s\n", resultbuf.pw_name, resultbuf.pw_passwd, (unsigned long)(resultbuf.pw_uid), (unsigned long)(resultbuf.pw_gid), @@ -842,7 +844,7 @@ int putspent(const struct spwd *p, FILE *stream) static const char ld_format[] = "%ld:"; const char *f; long int x; - int i; + size_t i; int rv = -1; __STDIO_AUTO_THREADLOCK_VAR; @@ -1124,7 +1126,7 @@ int attribute_hidden __parsespent(void *data, char * line) int attribute_hidden __pgsreader(int (*__parserfunc)(void *d, char *line), void *data, char *__restrict line_buff, size_t buflen, FILE *f) { - int line_len; + size_t line_len; int skip; int rv = ERANGE; __STDIO_AUTO_THREADLOCK_VAR; |