2 files changed, 61 insertions, 57 deletions

diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index 65eb692..5e44edc 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -3,79 +3,72 @@
  * password utility routines.
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2008 by Tito Ragusa <farmatito@tiscali.it>
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 #include "libbb.h"
 
-#define assert(x) ((void)0)
-
-/* internal function for bb_getpwuid and bb_getgrgid */
-/* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more
- * flexible:
- *
- * bufsize > 0:      If idname is not NULL it is copied to buffer,
- *                   and buffer is returned. Else id as string is written
- *                   to buffer, and NULL is returned.
- *
- * bufsize == 0:     idname is returned.
- *
- * bufsize < 0:      If idname is not NULL 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)
  */
-static char* bb_getug(char *buffer, int bufsize, char *idname, long id, char prefix)
+
+/* TODO: add xgetpwnam, this construct is used a lot */
+
+struct passwd* FAST_FUNC xgetpwuid(uid_t uid)
 {
-	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 = getpwuid(uid);
+	if (!pw)
+		bb_error_msg_and_die("unknown uid %u", (unsigned)uid);
+	return pw;
 }
 
-/* bb_getpwuid, bb_getgrgid:
- * bb_getXXXid(buf, bufsz, id) - copy user/group name or id
- *               as a string to buf, return user/group name or NULL
- * bb_getXXXid(NULL, 0, id) - return user/group name or NULL
- * bb_getXXXid(NULL, -1, id) - return user/group name or exit
- */
-/* gets a username given a uid */
-char* FAST_FUNC bb_getpwuid(char *name, int bufsize, long uid)
+struct group* FAST_FUNC xgetgrgid(gid_t gid)
 {
-	struct passwd *myuser = getpwuid(uid);
+	struct group *gr = getgrgid(gid);
+	if (!gr)
+		bb_error_msg_and_die("unknown gid %u", (unsigned)gid);
+	return gr;
+}
 
-	return bb_getug(name, bufsize,
-			(myuser ? myuser->pw_name : (char*)myuser),
-			uid, 'u');
+char* FAST_FUNC xuid2uname(uid_t uid)
+{
+	struct passwd *pw = xgetpwuid(uid);
+	return pw->pw_name;
 }
-/* gets a groupname given a gid */
-char* FAST_FUNC bb_getgrgid(char *group, int bufsize, long gid)
+
+char* FAST_FUNC xgid2group(gid_t gid)
 {
-	struct group *mygroup = getgrgid(gid);
+	struct group *gr = xgetgrgid(gid);
+	return gr->gr_name;
+}
 
-	return bb_getug(group, bufsize,
-			(mygroup ? mygroup->gr_name : (char*)mygroup),
-			gid, 'g');
+char* FAST_FUNC uid2uname(uid_t uid)
+{
+	struct passwd *pw = getpwuid(uid);
+	return (pw) ? pw->pw_name : NULL;
 }
 
-/* returns a gid given a group name */
-long FAST_FUNC xgroup2gid(const char *name)
+char* FAST_FUNC gid2group(gid_t gid)
 {
-	struct group *mygroup;
+	struct group *gr = getgrgid(gid);
+	return (gr) ? gr->gr_name : NULL;
+}
 
-	mygroup = getgrnam(name);
-	if (mygroup == NULL)
-		bb_error_msg_and_die("unknown group name: %s", name);
+char* FAST_FUNC uid2uname_utoa(long uid)
+{
+	char *name = uid2uname(uid);
+	return (name) ? name : utoa(uid);
+}
 
-	return mygroup->gr_gid;
+char* FAST_FUNC gid2group_utoa(long gid)
+{
+	char *name = gid2group(gid);
+	return (name) ? name : utoa(gid);
 }
 
-/* returns a uid given a username */
 long FAST_FUNC xuname2uid(const char *name)
 {
 	struct passwd *myuser;
@@ -87,6 +80,17 @@ long FAST_FUNC xuname2uid(const char *name)
 	return myuser->pw_uid;
 }
 
+long FAST_FUNC xgroup2gid(const char *name)
+{
+	struct group *mygroup;
+
+	mygroup = getgrnam(name);
+	if (mygroup == NULL)
+		bb_error_msg_and_die("unknown group %s", name);
+
+	return mygroup->gr_gid;
+}
+
 unsigned long FAST_FUNC get_ug_id(const char *s,
 		long FAST_FUNC (*xname2id)(const char *))
 {
diff --git a/libbb/procps.c b/libbb/procps.c
index 4d9a95b..c5e40bf 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -13,7 +13,7 @@
 
 
 typedef struct unsigned_to_name_map_t {
-	unsigned id;
+	long id;
 	char name[USERNAME_MAX_SIZE];
 } unsigned_to_name_map_t;
 
@@ -52,8 +52,8 @@ static int get_cached(cache_t *cp, unsigned id)
 }
 #endif
 
-typedef char* FAST_FUNC ug_func(char *name, int bufsize, long uid);
-static char* get_cached(cache_t *cp, unsigned id, ug_func* fp)
+static char* get_cached(cache_t *cp, long id,
+			char* FAST_FUNC x2x_utoa(long id))
 {
 	int i;
 	for (i = 0; i < cp->size; i++)
@@ -63,16 +63,16 @@ static char* get_cached(cache_t *cp, unsigned id, ug_func* fp)
 	cp->cache = xrealloc_vector(cp->cache, 2, i);
 	cp->cache[i].id = id;
 	/* Never fails. Generates numeric string if name isn't found */
-	fp(cp->cache[i].name, sizeof(cp->cache[i].name), id);
+	safe_strncpy(cp->cache[i].name, x2x_utoa(id), sizeof(cp->cache[i].name));
 	return cp->cache[i].name;
 }
 const char* FAST_FUNC get_cached_username(uid_t uid)
 {
-	return get_cached(&username, uid, bb_getpwuid);
+	return get_cached(&username, uid, uid2uname_utoa);
 }
 const char* FAST_FUNC get_cached_groupname(gid_t gid)
 {
-	return get_cached(&groupname, gid, bb_getgrgid);
+	return get_cached(&groupname, gid, gid2group_utoa);
 }