X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libpwdgrp%2Fpwd_grp.c;h=947f48d432e6e7d6f38e400618055b6a99fea8db;hb=d5fddcd57f4e692dd100121bb66adea8129fdbd6;hp=fcf6eaffebe2beddc48bbc2e8a6902570059f56f;hpb=7fa0fcafca76454effc65f8c3121a37cf0952ff9;p=oweals%2Fbusybox.git diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index fcf6eaffe..947f48d43 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c @@ -19,7 +19,7 @@ */ #include "libbb.h" -#include +//#include #include #ifndef _PATH_SHADOW @@ -43,22 +43,82 @@ /**********************************************************************/ /* Prototypes for internal functions. */ -static int __pgsreader(int (*parserfunc)(void *d, char *line), void *data, +static int bb__pgsreader(int (*parserfunc)(void *d, char *line), void *data, char *__restrict line_buff, size_t buflen, FILE *f); -static int __parsepwent(void *pw, char *line); -static int __parsegrent(void *gr, char *line); +static int bb__parsepwent(void *pw, char *line); +static int bb__parsegrent(void *gr, char *line); #if ENABLE_USE_BB_SHADOW -static int __parsespent(void *sp, char *line); +static int bb__parsespent(void *sp, char *line); #endif +/**********************************************************************/ +/* We avoid having big global data. */ + +struct statics { + /* Smaller things first */ + struct passwd getpwuid_resultbuf; + struct group getgrgid_resultbuf; + struct passwd getpwnam_resultbuf; + struct group getgrnam_resultbuf; + + char getpwuid_buffer[PWD_BUFFER_SIZE]; + char getgrgid_buffer[GRP_BUFFER_SIZE]; + char getpwnam_buffer[PWD_BUFFER_SIZE]; + char getgrnam_buffer[GRP_BUFFER_SIZE]; +#if 0 + struct passwd fgetpwent_resultbuf; + struct group fgetgrent_resultbuf; + struct spwd fgetspent_resultbuf; + char fgetpwent_buffer[PWD_BUFFER_SIZE]; + char fgetgrent_buffer[GRP_BUFFER_SIZE]; + char fgetspent_buffer[PWD_BUFFER_SIZE]; +#endif +#if 0 //ENABLE_USE_BB_SHADOW + struct spwd getspuid_resultbuf; + struct spwd getspnam_resultbuf; + char getspuid_buffer[PWD_BUFFER_SIZE]; + char getspnam_buffer[PWD_BUFFER_SIZE]; +#endif +// Not converted - too small to bother +//pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER; +//FILE *pwf /*= NULL*/; +//FILE *grf /*= NULL*/; +//FILE *spf /*= NULL*/; +#if 0 + struct passwd getpwent_pwd; + struct group getgrent_gr; + char getpwent_line_buff[PWD_BUFFER_SIZE]; + char getgrent_line_buff[GRP_BUFFER_SIZE]; +#endif +#if 0 //ENABLE_USE_BB_SHADOW + struct spwd getspent_spwd; + struct spwd sgetspent_spwd; + char getspent_line_buff[PWD_BUFFER_SIZE]; + char sgetspent_line_buff[PWD_BUFFER_SIZE]; +#endif +}; + +static struct statics *ptr_to_statics; + +static struct statics *get_S(void) +{ + if (!ptr_to_statics) + ptr_to_statics = xzalloc(sizeof(*ptr_to_statics)); + return ptr_to_statics; +} + +/* Always use in this order, get_S() must be called first */ +#define RESULTBUF(name) &((S = get_S())->name##_resultbuf) +#define BUFFER(name) (S->name##_buffer) + /**********************************************************************/ /* For the various fget??ent_r funcs, return * * 0: success * ENOENT: end-of-file encountered * ERANGE: buflen too small - * other error values possible. See __pgsreader. + * other error values possible. See bb__pgsreader. * * Also, *result == resultbuf on success and NULL on failure. * @@ -76,7 +136,7 @@ int fgetpwent_r(FILE *__restrict stream, struct passwd *__restrict resultbuf, *result = NULL; - rv = __pgsreader(__parsepwent, resultbuf, buffer, buflen, stream); + rv = bb__pgsreader(bb__parsepwent, resultbuf, buffer, buflen, stream); if (!rv) { *result = resultbuf; } @@ -92,7 +152,7 @@ int fgetgrent_r(FILE *__restrict stream, struct group *__restrict resultbuf, *result = NULL; - rv = __pgsreader(__parsegrent, resultbuf, buffer, buflen, stream); + rv = bb__pgsreader(bb__parsegrent, resultbuf, buffer, buflen, stream); if (!rv) { *result = resultbuf; } @@ -109,7 +169,7 @@ int fgetspent_r(FILE *__restrict stream, struct spwd *__restrict resultbuf, *result = NULL; - rv = __pgsreader(__parsespent, resultbuf, buffer, buflen, stream); + rv = bb__pgsreader(bb__parsespent, resultbuf, buffer, buflen, stream); if (!rv) { *result = resultbuf; } @@ -121,39 +181,46 @@ int fgetspent_r(FILE *__restrict stream, struct spwd *__restrict resultbuf, /**********************************************************************/ /* For the various fget??ent funcs, return NULL on failure and a * pointer to the appropriate struct (statically allocated) on success. - */ + * TODO: audit & stop using these in bbox, they pull in static buffers */ /**********************************************************************/ +#if 0 struct passwd *fgetpwent(FILE *stream) { - static char buffer[PWD_BUFFER_SIZE]; - static struct passwd resultbuf; + struct statics *S; + struct passwd *resultbuf = RESULTBUF(fgetpwent); + char *buffer = BUFFER(fgetpwent); struct passwd *result; - fgetpwent_r(stream, &resultbuf, buffer, sizeof(buffer), &result); + fgetpwent_r(stream, resultbuf, buffer, sizeof(BUFFER(fgetpwent)), &result); return result; } struct group *fgetgrent(FILE *stream) { - static char buffer[GRP_BUFFER_SIZE]; - static struct group resultbuf; + struct statics *S; + struct group *resultbuf = RESULTBUF(fgetgrent); + char *buffer = BUFFER(fgetgrent); struct group *result; - fgetgrent_r(stream, &resultbuf, buffer, sizeof(buffer), &result); + fgetgrent_r(stream, resultbuf, buffer, sizeof(BUFFER(fgetgrent)), &result); return result; } +#endif #if ENABLE_USE_BB_SHADOW +#if 0 struct spwd *fgetspent(FILE *stream) { - static char buffer[PWD_BUFFER_SIZE]; - static struct spwd resultbuf; + struct statics *S; + struct spwd *resultbuf = RESULTBUF(fgetspent); + char *buffer = BUFFER(fgetspent); struct spwd *result; - fgetspent_r(stream, &resultbuf, buffer, sizeof(buffer), &result); + fgetspent_r(stream, resultbuf, buffer, sizeof(BUFFER(fgetspent)), &result); return result; } +#endif int sgetspent_r(const char *string, struct spwd *result_buf, char *buffer, size_t buflen, struct spwd **result) @@ -175,7 +242,7 @@ int sgetspent_r(const char *string, struct spwd *result_buf, strcpy(buffer, string); } - rv = __parsespent(result_buf, buffer); + rv = bb__parsespent(result_buf, buffer); if (!rv) { *result = result_buf; } @@ -187,71 +254,72 @@ int sgetspent_r(const char *string, struct spwd *result_buf, /**********************************************************************/ -#ifdef GETXXKEY_R_FUNC -#error GETXXKEY_R_FUNC is already defined! -#endif - -#define GETXXKEY_R_FUNC getpwnam_R -#define GETXXKEY_R_PARSER __parsepwent +#define GETXXKEY_R_FUNC getpwnam_r +#define GETXXKEY_R_PARSER bb__parsepwent #define GETXXKEY_R_ENTTYPE struct passwd #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->pw_name, key)) -#define DO_GETXXKEY_R_KEYTYPE const char *__restrict -#define DO_GETXXKEY_R_PATHNAME _PATH_PASSWD +#define GETXXKEY_R_KEYTYPE const char *__restrict +#define GETXXKEY_R_PATHNAME _PATH_PASSWD #include "pwd_grp_internal.c" -#define GETXXKEY_R_FUNC getgrnam_R -#define GETXXKEY_R_PARSER __parsegrent +#define GETXXKEY_R_FUNC getgrnam_r +#define GETXXKEY_R_PARSER bb__parsegrent #define GETXXKEY_R_ENTTYPE struct group #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->gr_name, key)) -#define DO_GETXXKEY_R_KEYTYPE const char *__restrict -#define DO_GETXXKEY_R_PATHNAME _PATH_GROUP +#define GETXXKEY_R_KEYTYPE const char *__restrict +#define GETXXKEY_R_PATHNAME _PATH_GROUP #include "pwd_grp_internal.c" #if ENABLE_USE_BB_SHADOW -#define GETXXKEY_R_FUNC getspnam_R -#define GETXXKEY_R_PARSER __parsespent +#define GETXXKEY_R_FUNC getspnam_r +#define GETXXKEY_R_PARSER bb__parsespent #define GETXXKEY_R_ENTTYPE struct spwd #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->sp_namp, key)) -#define DO_GETXXKEY_R_KEYTYPE const char *__restrict -#define DO_GETXXKEY_R_PATHNAME _PATH_SHADOW +#define GETXXKEY_R_KEYTYPE const char *__restrict +#define GETXXKEY_R_PATHNAME _PATH_SHADOW #include "pwd_grp_internal.c" #endif -#define GETXXKEY_R_FUNC getpwuid_R -#define GETXXKEY_R_PARSER __parsepwent +#define GETXXKEY_R_FUNC getpwuid_r +#define GETXXKEY_R_PARSER bb__parsepwent #define GETXXKEY_R_ENTTYPE struct passwd #define GETXXKEY_R_TEST(ENT) ((ENT)->pw_uid == key) -#define DO_GETXXKEY_R_KEYTYPE uid_t -#define DO_GETXXKEY_R_PATHNAME _PATH_PASSWD +#define GETXXKEY_R_KEYTYPE uid_t +#define GETXXKEY_R_PATHNAME _PATH_PASSWD #include "pwd_grp_internal.c" -#define GETXXKEY_R_FUNC getgrgid_R -#define GETXXKEY_R_PARSER __parsegrent +#define GETXXKEY_R_FUNC getgrgid_r +#define GETXXKEY_R_PARSER bb__parsegrent #define GETXXKEY_R_ENTTYPE struct group #define GETXXKEY_R_TEST(ENT) ((ENT)->gr_gid == key) -#define DO_GETXXKEY_R_KEYTYPE gid_t -#define DO_GETXXKEY_R_PATHNAME _PATH_GROUP +#define GETXXKEY_R_KEYTYPE gid_t +#define GETXXKEY_R_PATHNAME _PATH_GROUP #include "pwd_grp_internal.c" /**********************************************************************/ +/* TODO: audit & stop using these in bbox, they pull in static buffers */ +/* This one has many users */ struct passwd *getpwuid(uid_t uid) { - static char buffer[PWD_BUFFER_SIZE]; - static struct passwd resultbuf; + struct statics *S; + struct passwd *resultbuf = RESULTBUF(getpwuid); + char *buffer = BUFFER(getpwuid); struct passwd *result; - getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result); + getpwuid_r(uid, resultbuf, buffer, sizeof(BUFFER(getpwuid)), &result); return result; } +/* This one has many users */ struct group *getgrgid(gid_t gid) { - static char buffer[GRP_BUFFER_SIZE]; - static struct group resultbuf; + struct statics *S; + struct group *resultbuf = RESULTBUF(getgrgid); + char *buffer = BUFFER(getgrgid); struct group *result; - getgrgid_r(gid, &resultbuf, buffer, sizeof(buffer), &result); + getgrgid_r(gid, resultbuf, buffer, sizeof(BUFFER(getgrgid)), &result); return result; } @@ -281,47 +349,55 @@ int getspuid_r(uid_t uid, struct spwd *__restrict resultbuf, * Why it was added, I do not know. */ struct spwd *getspuid(uid_t uid) { - static char buffer[PWD_BUFFER_SIZE]; - static struct spwd resultbuf; + struct statics *S; + struct spwd *resultbuf = RESULTBUF(getspuid); + char *buffer = BUFFER(getspuid); struct spwd *result; - getspuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result); + getspuid_r(uid, resultbuf, buffer, sizeof(BUFFER(getspuid)), &result); return result; } #endif +/* This one has many users */ struct passwd *getpwnam(const char *name) { - static char buffer[PWD_BUFFER_SIZE]; - static struct passwd resultbuf; + struct statics *S; + struct passwd *resultbuf = RESULTBUF(getpwnam); + char *buffer = BUFFER(getpwnam); struct passwd *result; - getpwnam_r(name, &resultbuf, buffer, sizeof(buffer), &result); + getpwnam_r(name, resultbuf, buffer, sizeof(BUFFER(getpwnam)), &result); return result; } +/* This one has many users */ struct group *getgrnam(const char *name) { - static char buffer[GRP_BUFFER_SIZE]; - static struct group resultbuf; + struct statics *S; + struct group *resultbuf = RESULTBUF(getgrnam); + char *buffer = BUFFER(getgrnam); struct group *result; - getgrnam_r(name, &resultbuf, buffer, sizeof(buffer), &result); + getgrnam_r(name, resultbuf, buffer, sizeof(BUFFER(getgrnam)), &result); return result; } -#if ENABLE_USE_BB_SHADOW +#if 0 //ENABLE_USE_BB_SHADOW struct spwd *getspnam(const char *name) { - static char buffer[PWD_BUFFER_SIZE]; - static struct spwd resultbuf; + struct statics *S; + struct spwd *resultbuf = RESULTBUF(getspnam); + char *buffer = BUFFER(getspnam); struct spwd *result; - getspnam_r(name, &resultbuf, buffer, sizeof(buffer), &result); + getspnam_r(name, resultbuf, buffer, sizeof(BUFFER(getspnam)), &result); return result; } #endif +#ifdef THIS_ONE_IS_UNUSED +/* This one doesn't use static buffers */ int getpw(uid_t uid, char *buf) { struct passwd resultbuf; @@ -329,7 +405,7 @@ int getpw(uid_t uid, char *buf) char buffer[PWD_BUFFER_SIZE]; if (!buf) { - errno=EINVAL; + errno = EINVAL; } else if (!getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result)) { if (sprintf(buf, "%s:%s:%lu:%lu:%s:%s:%s\n", resultbuf.pw_name, resultbuf.pw_passwd, @@ -344,9 +420,12 @@ int getpw(uid_t uid, char *buf) return -1; } +#endif /**********************************************************************/ +/* FIXME: we don't have such CONFIG_xx - ?! */ + #if defined CONFIG_USE_BB_THREADSAFE_SHADOW && defined PTHREAD_MUTEX_INITIALIZER static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER; # define LOCK pthread_mutex_lock(&mylock) @@ -387,14 +466,14 @@ int getpwent_r(struct passwd *__restrict resultbuf, *result = NULL; /* In case of error... */ if (!pwf) { - pwf = fopen(_PATH_PASSWD, "r"); + pwf = fopen_for_read(_PATH_PASSWD); if (!pwf) { rv = errno; goto ERR; } } - rv = __pgsreader(__parsepwent, resultbuf, buffer, buflen, pwf); + rv = bb__pgsreader(bb__parsepwent, resultbuf, buffer, buflen, pwf); if (!rv) { *result = resultbuf; } @@ -434,14 +513,14 @@ int getgrent_r(struct group *__restrict resultbuf, *result = NULL; /* In case of error... */ if (!grf) { - grf = fopen(_PATH_GROUP, "r"); + grf = fopen_for_read(_PATH_GROUP); if (!grf) { rv = errno; goto ERR; } } - rv = __pgsreader(__parsegrent, resultbuf, buffer, buflen, grf); + rv = bb__pgsreader(bb__parsegrent, resultbuf, buffer, buflen, grf); if (!rv) { *result = resultbuf; } @@ -481,14 +560,14 @@ int getspent_r(struct spwd *resultbuf, char *buffer, *result = NULL; /* In case of error... */ if (!spf) { - spf = fopen(_PATH_SHADOW, "r"); + spf = fopen_for_read(_PATH_SHADOW); if (!spf) { rv = errno; goto ERR; } } - rv = __pgsreader(__parsespent, resultbuf, buffer, buflen, spf); + rv = bb__pgsreader(bb__parsespent, resultbuf, buffer, buflen, spf); if (!rv) { *result = resultbuf; } @@ -499,6 +578,7 @@ int getspent_r(struct spwd *resultbuf, char *buffer, } #endif +#if 0 struct passwd *getpwent(void) { static char line_buff[PWD_BUFFER_SIZE]; @@ -518,8 +598,9 @@ struct group *getgrent(void) getgrent_r(&gr, line_buff, sizeof(line_buff), &result); return result; } +#endif -#if ENABLE_USE_BB_SHADOW +#if 0 //ENABLE_USE_BB_SHADOW struct spwd *getspent(void) { static char line_buff[PWD_BUFFER_SIZE]; @@ -541,56 +622,63 @@ struct spwd *sgetspent(const char *string) } #endif -int initgroups(const char *user, gid_t gid) +static gid_t *getgrouplist_internal(int *ngroups_ptr, const char *user, gid_t gid) { FILE *grfile; gid_t *group_list; - int num_groups, rv; - char **m; + int ngroups; struct group group; char buff[PWD_BUFFER_SIZE]; - rv = -1; - /* We alloc space for 8 gids at a time. */ - group_list = (gid_t *) malloc(8*sizeof(gid_t *)); - if (group_list - && ((grfile = fopen(_PATH_GROUP, "r")) != NULL) - ) { - *group_list = gid; - num_groups = 1; - - while (!__pgsreader(__parsegrent, &group, buff, sizeof(buff), grfile)) { + group_list = xmalloc(8 * sizeof(group_list[0])); + group_list[0] = gid; + ngroups = 1; + + grfile = fopen_for_read(_PATH_GROUP); + if (grfile) { + while (!bb__pgsreader(bb__parsegrent, &group, buff, sizeof(buff), grfile)) { + char **m; assert(group.gr_mem); /* Must have at least a NULL terminator. */ - if (group.gr_gid != gid) { - for (m=group.gr_mem ; *m ; m++) { - if (!strcmp(*m, user)) { - if (!(num_groups & 7)) { - gid_t *tmp = (gid_t *) - realloc(group_list, - (num_groups+8) * sizeof(gid_t *)); - if (!tmp) { - rv = -1; - goto DO_CLOSE; - } - group_list = tmp; - } - group_list[num_groups++] = group.gr_gid; - break; - } - } + if (group.gr_gid == gid) + continue; + for (m = group.gr_mem; *m; m++) { + if (strcmp(*m, user) != 0) + continue; + group_list = xrealloc_vector(group_list, 3, ngroups); + group_list[ngroups++] = group.gr_gid; + break; } } - - rv = setgroups(num_groups, group_list); - DO_CLOSE: fclose(grfile); } + *ngroups_ptr = ngroups; + return group_list; +} - /* group_list will be NULL if initial malloc failed, which may trigger - * warnings from various malloc debuggers. */ +int initgroups(const char *user, gid_t gid) +{ + int ngroups; + gid_t *group_list = getgrouplist_internal(&ngroups, user, gid); + + ngroups = setgroups(ngroups, group_list); free(group_list); - return rv; + return ngroups; +} + +int getgrouplist(const char *user, gid_t gid, gid_t *groups, int *ngroups) +{ + int ngroups_old = *ngroups; + gid_t *group_list = getgrouplist_internal(ngroups, user, gid); + + if (*ngroups <= ngroups_old) { + ngroups_old = *ngroups; + memcpy(groups, group_list, ngroups_old * sizeof(groups[0])); + } else { + ngroups_old = -1; + } + free(group_list); + return ngroups_old; } int putpwent(const struct passwd *__restrict p, FILE *__restrict f) @@ -598,7 +686,7 @@ int putpwent(const struct passwd *__restrict p, FILE *__restrict f) int rv = -1; if (!p || !f) { - errno=EINVAL; + errno = EINVAL; } else { /* No extra thread locking is needed above what fprintf does. */ if (fprintf(f, "%s:%s:%lu:%lu:%s:%s:%s\n", @@ -616,13 +704,14 @@ int putpwent(const struct passwd *__restrict p, FILE *__restrict f) int putgrent(const struct group *__restrict p, FILE *__restrict f) { - static const char format[] = ",%s"; + static const char format[] ALIGN1 = ",%s"; + char **m; const char *fmt; int rv = -1; if (!p || !f) { /* Sigh... glibc checks. */ - errno=EINVAL; + errno = EINVAL; } else { if (fprintf(f, "%s:%s:%lu:", p->gr_name, p->gr_passwd, @@ -656,20 +745,21 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f) } #if ENABLE_USE_BB_SHADOW -static const unsigned char _sp_off[] = { - offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ - offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ - offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ - offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ - offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ - offsetof(struct spwd, sp_expire), /* 7 - not a char ptr */ +static const unsigned char _sp_off[] ALIGN1 = { + offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ + offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ + offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ + offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ + offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ + offsetof(struct spwd, sp_expire) /* 7 - not a char ptr */ }; int putspent(const struct spwd *p, FILE *stream) { - static const char ld_format[] = "%ld:"; + static const char ld_format[] ALIGN1 = "%ld:"; + const char *f; - long int x; + long x; int i; int rv = -1; @@ -680,9 +770,9 @@ int putspent(const struct spwd *p, FILE *stream) goto DO_UNLOCK; } - for (i=0 ; i < sizeof(_sp_off) ; i++) { + for (i = 0; i < sizeof(_sp_off); i++) { f = ld_format; - x = *(const long int *)(((const char *) p) + _sp_off[i]); + x = *(const long *)(((const char *) p) + _sp_off[i]); if (x == -1) { f += 3; } @@ -705,20 +795,20 @@ DO_UNLOCK: #endif /**********************************************************************/ -/* Internal uClibc functions. */ +/* Internal uClibc functions. */ /**********************************************************************/ -static const unsigned char pw_off[] = { - offsetof(struct passwd, pw_name), /* 0 */ - offsetof(struct passwd, pw_passwd), /* 1 */ - offsetof(struct passwd, pw_uid), /* 2 - not a char ptr */ - offsetof(struct passwd, pw_gid), /* 3 - not a char ptr */ - offsetof(struct passwd, pw_gecos), /* 4 */ - offsetof(struct passwd, pw_dir), /* 5 */ - offsetof(struct passwd, pw_shell) /* 6 */ +static const unsigned char pw_off[] ALIGN1 = { + offsetof(struct passwd, pw_name), /* 0 */ + offsetof(struct passwd, pw_passwd), /* 1 */ + offsetof(struct passwd, pw_uid), /* 2 - not a char ptr */ + offsetof(struct passwd, pw_gid), /* 3 - not a char ptr */ + offsetof(struct passwd, pw_gecos), /* 4 */ + offsetof(struct passwd, pw_dir), /* 5 */ + offsetof(struct passwd, pw_shell) /* 6 */ }; -static int __parsepwent(void *data, char *line) +static int bb__parsepwent(void *data, char *line) { char *endptr; char *p; @@ -726,7 +816,7 @@ static int __parsepwent(void *data, char *line) i = 0; do { - p = ((char *) ((struct passwd *) data)) + pw_off[i]; + p = (char *) data + pw_off[i]; if ((i & 6) ^ 2) { /* i!=2 and i!=3 */ *((char **) p) = line; @@ -766,13 +856,13 @@ static int __parsepwent(void *data, char *line) /**********************************************************************/ -static const unsigned char gr_off[] = { - offsetof(struct group, gr_name), /* 0 */ - offsetof(struct group, gr_passwd), /* 1 */ - offsetof(struct group, gr_gid) /* 2 - not a char ptr */ +static const unsigned char gr_off[] ALIGN1 = { + offsetof(struct group, gr_name), /* 0 */ + offsetof(struct group, gr_passwd), /* 1 */ + offsetof(struct group, gr_gid) /* 2 - not a char ptr */ }; -static int __parsegrent(void *data, char *line) +static int bb__parsegrent(void *data, char *line) { char *endptr; char *p; @@ -783,7 +873,7 @@ static int __parsegrent(void *data, char *line) end_of_buf = ((struct group *) data)->gr_name; /* Evil hack! */ i = 0; do { - p = ((char *) ((struct group *) data)) + gr_off[i]; + p = (char *) data + gr_off[i]; if (i < 2) { *((char **) p) = line; @@ -862,28 +952,29 @@ static int __parsegrent(void *data, char *line) } /**********************************************************************/ + #if ENABLE_USE_BB_SHADOW -static const unsigned char sp_off[] = { - offsetof(struct spwd, sp_namp), /* 0 */ - offsetof(struct spwd, sp_pwdp), /* 1 */ - offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ - offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ - offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ - offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ - offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ - offsetof(struct spwd, sp_expire), /* 7 - not a char ptr */ - offsetof(struct spwd, sp_flag) /* 8 - not a char ptr */ +static const unsigned char sp_off[] ALIGN1 = { + offsetof(struct spwd, sp_namp), /* 0 */ + offsetof(struct spwd, sp_pwdp), /* 1 */ + offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ + offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ + offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ + offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ + offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ + offsetof(struct spwd, sp_expire), /* 7 - not a char ptr */ + offsetof(struct spwd, sp_flag) /* 8 - not a char ptr */ }; -static int __parsespent(void *data, char * line) +static int bb__parsespent(void *data, char *line) { char *endptr; char *p; int i; i = 0; - do { - p = ((char *) ((struct spwd *) data)) + sp_off[i]; + while (1) { + p = (char *) data + sp_off[i]; if (i < 2) { *((char **) p) = line; line = strchr(line, ':'); @@ -891,10 +982,10 @@ static int __parsespent(void *data, char * line) break; } } else { - *((long *) p) = (long) strtoul(line, &endptr, 10); + *((long *) p) = strtoul(line, &endptr, 10); if (endptr == line) { - *((long *) p) = ((i != 8) ? -1L : ((long)(~0UL))); + *((long *) p) = (i != 8) ? -1L : (long)(~0UL); } line = endptr; @@ -912,9 +1003,9 @@ static int __parsespent(void *data, char * line) } - *line++ = 0; + *line++ = '\0'; ++i; - } while (1); + } return EINVAL; } @@ -928,7 +1019,7 @@ static int __parsespent(void *data, char * line) * Returns 0 on success and ENOENT for end-of-file (glibc concession). */ -static int __pgsreader(int (*parserfunc)(void *d, char *line), void *data, +static int bb__pgsreader(int (*parserfunc)(void *d, char *line), void *data, char *__restrict line_buff, size_t buflen, FILE *f) { int line_len; @@ -966,7 +1057,7 @@ static int __pgsreader(int (*parserfunc)(void *d, char *line), void *data, /* Skip empty lines, comment lines, and lines with leading * whitespace. */ if (*line_buff && (*line_buff != '#') && !isspace(*line_buff)) { - if (parserfunc == __parsegrent) { /* Do evil group hack. */ + if (parserfunc == bb__parsegrent) { /* Do evil group hack. */ /* The group entry parsing function needs to know where * the end of the buffer is so that it can construct the * group member ptr table. */