X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fbb_pwd.c;h=d728577714f0017cc20386b5601763f5f0219582;hb=cb39a7ca6dba94388657873651547c5ff320ad93;hp=3af1994d59ee9d806474eb327704d3e33be48d6d;hpb=219d14d514ca4d31b4319af14e3a64b66fe2c233;p=oweals%2Fbusybox.git diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c index 3af1994d5..d72857771 100644 --- a/libbb/bb_pwd.c +++ b/libbb/bb_pwd.c @@ -3,122 +3,105 @@ * password utility routines. * * Copyright (C) 1999-2004 by Erik Andersen + * Copyright (C) 2008 by Tito Ragusa * * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ #include "libbb.h" -#define assert(x) ((void)0) - -/* - * if bufsize is > 0 char *buffer cannot be set to NULL. - * If idname is not NULL it is written on the static - * allocated buffer (and a pointer to it is returned). - * if idname is NULL, id as string is written to the static - * allocated buffer and NULL is returned. - * if bufsize is = 0 char *buffer can be set to NULL. - * If idname exists a pointer to it is returned, - * else NULL is returned. - * if bufsize is < 0 char *buffer can be set to NULL. - * If idname exists a pointer to it is returned, - * else an error message is printed and the program exits. +/* TODO: maybe change API to return malloced data? + * This will allow to stop using libc functions returning + * pointers to static data (getpwuid) */ -/* internal function for bb_getpwuid and bb_getgrgid */ -static char* bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix) +struct passwd* FAST_FUNC xgetpwnam(const char *name) { - if (bufsize > 0) { - assert(buffer != NULL); - if (idname) { - return safe_strncpy(buffer, idname, bufsize); - } - snprintf(buffer, bufsize, "%ld", id); - } else if (bufsize < 0 && !idname) { - bb_error_msg_and_die("unknown %cid %ld", prefix, id); - } - return idname; + struct passwd *pw = getpwnam(name); + if (!pw) + bb_error_msg_and_die("unknown user %s", name); + return pw; } -/* Hacked by Tito Ragusa (c) 2004 to make it more - * flexible : - * - * if bufsize is > 0 char *group cannot be set to NULL. - * On success groupname is written on static allocated buffer - * group (and a pointer to it is returned). - * On failure gid as string is written to static allocated - * buffer group and NULL is returned. - * if bufsize is = 0 char *group can be set to NULL. - * On success groupname is returned. - * On failure NULL is returned. - * if bufsize is < 0 char *group can be set to NULL. - * On success groupname is returned. - * On failure an error message is printed and - * the program exits. - */ +struct group* FAST_FUNC xgetgrnam(const char *name) +{ + struct group *gr = getgrnam(name); + if (!gr) + bb_error_msg_and_die("unknown group %s", name); + return gr; +} -/* gets a groupname given a gid */ -char* bb_getgrgid(char *group, long gid, int bufsize) + +struct passwd* FAST_FUNC xgetpwuid(uid_t uid) { - struct group *mygroup = getgrgid(gid); + struct passwd *pw = getpwuid(uid); + if (!pw) + bb_error_msg_and_die("unknown uid %u", (unsigned)uid); + return pw; +} - return bb_getug(group, - mygroup ? mygroup->gr_name : (char *)mygroup, - gid, bufsize, 'g'); +struct group* FAST_FUNC xgetgrgid(gid_t gid) +{ + struct group *gr = getgrgid(gid); + if (!gr) + bb_error_msg_and_die("unknown gid %u", (unsigned)gid); + return gr; } -/* returns a gid given a group name */ -long xgroup2gid(const char *name) +char* FAST_FUNC xuid2uname(uid_t uid) { - struct group *mygroup; + struct passwd *pw = xgetpwuid(uid); + return pw->pw_name; +} - mygroup = getgrnam(name); - if (mygroup == NULL) - bb_error_msg_and_die("unknown group name: %s", name); +char* FAST_FUNC xgid2group(gid_t gid) +{ + struct group *gr = xgetgrgid(gid); + return gr->gr_name; +} - return mygroup->gr_gid; +char* FAST_FUNC uid2uname(uid_t uid) +{ + struct passwd *pw = getpwuid(uid); + return (pw) ? pw->pw_name : NULL; } -/* returns a uid given a username */ -long xuname2uid(const char *name) +char* FAST_FUNC gid2group(gid_t gid) { - struct passwd *myuser; + struct group *gr = getgrgid(gid); + return (gr) ? gr->gr_name : NULL; +} - myuser = getpwnam(name); - if (myuser == NULL) - bb_error_msg_and_die("unknown user name: %s", name); +char* FAST_FUNC uid2uname_utoa(long uid) +{ + char *name = uid2uname(uid); + return (name) ? name : utoa(uid); +} - return myuser->pw_uid; +char* FAST_FUNC gid2group_utoa(long gid) +{ + char *name = gid2group(gid); + return (name) ? name : utoa(gid); } -/* Hacked by Tito Ragusa (c) 2004 to make it more - * flexible : - * - * if bufsize is > 0 char *name cannot be set to NULL. - * On success username is written on the static allocated - * buffer name (and a pointer to it is returned). - * On failure uid as string is written to the static - * allocated buffer name and NULL is returned. - * if bufsize is = 0 char *name can be set to NULL. - * On success username is returned. - * On failure NULL is returned. - * if bufsize is < 0 char *name can be set to NULL - * On success username is returned. - * On failure an error message is printed and - * the program exits. - */ +long FAST_FUNC xuname2uid(const char *name) +{ + struct passwd *myuser; -/* gets a username given a uid */ -char* bb_getpwuid(char *name, long uid, int bufsize) + myuser = xgetpwnam(name); + return myuser->pw_uid; +} + +long FAST_FUNC xgroup2gid(const char *name) { - struct passwd *myuser = getpwuid(uid); + struct group *mygroup; - return bb_getug(name, myuser ? myuser->pw_name : (char *)myuser, - uid, bufsize, 'u'); + mygroup = xgetgrnam(name); + return mygroup->gr_gid; } -unsigned long get_ug_id(const char *s, - long (*xname2id)(const char *)) +unsigned long FAST_FUNC get_ug_id(const char *s, + long FAST_FUNC (*xname2id)(const char *)) { unsigned long r;