Hi,
First attempt to create a cleaner api in bb_pwd.c by removing
bb_getgrgid, bb_getpwuid and bb_getug and substituting
them with these functions:
struct passwd* xgetpwuid(uid_t uid) FAST_FUNC;
char* xuid2uname(uid_t uid) FAST_FUNC;
char* uid2uname(uid_t uid) FAST_FUNC;
char* uid2uname_utoa(uid_t uid) FAST_FUNC;
struct group* xgetgrgid(gid_t gid) FAST_FUNC;
char* xgid2group(gid_t gid) FAST_FUNC;
char* gid2group(gid_t gid) FAST_FUNC;
char* gid2group_utoa(gid_t gid) FAST_FUNC;
The patches are mostly trivial but not well tested especially the
one touching logger.c.
The series is:
01-bb_pwd.patch
02-include_libbb.patch
03-id.patch
04-whoami.patch
05-procps.patch
06-passwd.patch
07-sendmail.patch
09-logger.patch
10-sulogin.patch
11-vlock.patch
12-crontab.patch
Bloat-o-meter:
scripts/bloat-o-meter busybox_old busybox_unstripped
function old new delta
xgetpwuid - 27 +27
uid2uname_utoa - 22 +22
gid2group_utoa - 22 +22
uid2uname - 18 +18
gid2group - 18 +18
print_user 12 24 +12
print_group 12 24 +12
find_main 406 418 +12
get_cached 89 99 +10
xuid2uname - 8 +8
bbunpack 440 448 +8
display_speed 85 90 +5
parse_command 1460 1463 +3
pack_gzip 1660 1658 -2
compare_keys 737 735 -2
.rodata 117358 117356 -2
whoami_main 50 43 -7
sendmail_main 1486 1479 -7
lpqr_main 1149 1142 -7
passwd_main 1053 1043 -10
print_common 121 107 -14
logger_main 410 394 -16
vlock_main 431 412 -19
sulogin_main 509 489 -20
crontab_main 642 609 -33
bb_getpwuid 42 - -42
bb_getgrgid 42 - -42
bb_getug 80 - -80
------------------------------------------------------------------------------
(add/remove: 6/3 grow/shrink: 7/12 up/down: 177/-303) Total: -126 bytes
Please take a look at them and apply if you like them.
Ciao,
Tito
--- busybox.old/libbb/bb_pwd.c 2008-07-22 13:43:09.000000000 +0200
+++ busybox/libbb/bb_pwd.c 2008-11-05 17:08:47.000000000 +0100
@@ -3,64 +3,63 @@
* password utility routines.
*
* Copyright (C) 1999-2004 by Erik Andersen <[EMAIL PROTECTED]>
+ * Copyright (C) 2008 by Tito Ragusa <[EMAIL PROTECTED]>
*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
#include "libbb.h"
-#define assert(x) ((void)0)
+struct passwd* FAST_FUNC xgetpwuid(uid_t uid)
+{
+ struct passwd *pw = getpwuid(uid);
+ if (!pw)
+ bb_error_msg_and_die("unknown uid %u", uid);
+ return pw;
+}
-/* internal function for bb_getpwuid and bb_getgrgid */
-/* Hacked by Tito Ragusa (c) 2004 <[EMAIL PROTECTED]> 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.
- */
-static char* bb_getug(char *buffer, int bufsize, char *idname, long id, char prefix)
+char* FAST_FUNC xuid2uname(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;
-}
-
-/* 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 passwd *pw = xgetpwuid(uid);
+ return pw->pw_name;
+}
+
+char* FAST_FUNC uid2uname(uid_t uid)
+{
+ struct passwd *pw = getpwuid(uid);
+ return (pw) ? pw->pw_name : NULL;
+}
+
+char* FAST_FUNC uid2uname_utoa(uid_t uid)
+{
+ char *name = uid2uname(uid);
+ return (name) ? name : utoa(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", gid);
+ return gr;
+}
- return bb_getug(name, bufsize,
- (myuser ? myuser->pw_name : (char*)myuser),
- uid, 'u');
+char* FAST_FUNC xgid2group(gid_t gid)
+{
+ struct group *gr = xgetgrgid(gid);
+ return gr->gr_name;
}
-/* gets a groupname given a gid */
-char* FAST_FUNC bb_getgrgid(char *group, int bufsize, long gid)
+
+char* FAST_FUNC gid2group(gid_t gid)
{
- struct group *mygroup = getgrgid(gid);
+ struct group *gr = getgrgid(gid);
+ return (gr) ? gr->gr_name : NULL;
+}
- return bb_getug(group, bufsize,
- (mygroup ? mygroup->gr_name : (char*)mygroup),
- gid, 'g');
+char* FAST_FUNC gid2group_utoa(gid_t gid)
+{
+ char *name = gid2group(gid);
+ return (name) ? name : utoa(gid);
}
/* returns a gid given a group name */
--- busybox.old/include/libbb.h 2008-11-04 22:03:37.000000000 +0100
+++ busybox/include/libbb.h 2008-11-05 10:07:59.000000000 +0100
@@ -701,14 +701,14 @@
void xget_uidgid(struct bb_uidgid_t*, const char*) FAST_FUNC;
/* chown-like handling of "user[:[group]" */
void parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group) FAST_FUNC;
-/* 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
-*/
-char *bb_getpwuid(char *name, int bufsize, long uid) FAST_FUNC;
-char *bb_getgrgid(char *group, int bufsize, long gid) FAST_FUNC;
+struct passwd* xgetpwuid(uid_t uid) FAST_FUNC;
+char* xuid2uname(uid_t uid) FAST_FUNC;
+char* uid2uname(uid_t uid) FAST_FUNC;
+char* uid2uname_utoa(uid_t uid) FAST_FUNC;
+struct group* xgetgrgid(gid_t gid) FAST_FUNC;
+char* xgid2group(gid_t gid) FAST_FUNC;
+char* gid2group(gid_t gid) FAST_FUNC;
+char* gid2group_utoa(gid_t gid) FAST_FUNC;
/* versions which cache results (useful for ps, ls etc) */
const char* get_cached_username(uid_t uid) FAST_FUNC;
const char* get_cached_groupname(gid_t gid) FAST_FUNC;
--- busybox.old/libbb/procps.c 2008-09-25 13:59:34.000000000 +0200
+++ busybox/libbb/procps.c 2008-11-05 17:21:46.000000000 +0100
@@ -52,8 +52,8 @@
}
#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, unsigned id,
+ char* FAST_FUNC x2x_utoa(unsigned id))
{
int i;
for (i = 0; i < cp->size; i++)
@@ -63,16 +63,16 @@
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);
+ 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);
}
--- busybox.old/coreutils/id.c 2008-11-05 10:30:28.000000000 +0100
+++ busybox/coreutils/id.c 2008-11-05 17:16:13.000000000 +0100
@@ -28,12 +28,8 @@
#endif
};
-static int print_common(unsigned id,
- char* FAST_FUNC bb_getXXXid(char *name, int bufsize, long uid),
- const char *prefix)
+static int print_common(unsigned id, const char *name, const char *prefix)
{
- const char *name = bb_getXXXid(NULL, 0, id);
-
if (prefix) {
printf("%s", prefix);
}
@@ -57,12 +53,12 @@
static int print_group(gid_t id, const char *prefix)
{
- return print_common(id, bb_getgrgid, prefix);
+ return print_common(id, gid2group(id), prefix);
}
static int print_user(uid_t id, const char *prefix)
{
- return print_common(id, bb_getpwuid, prefix);
+ return print_common(id, uid2uname(id), prefix);
}
/* On error set *n < 0 and return >= 0
--- busybox.old/loginutils/passwd.c 2008-07-22 13:43:09.000000000 +0200
+++ busybox/loginutils/passwd.c 2008-11-05 17:25:49.000000000 +0100
@@ -115,7 +115,7 @@
bb_show_usage();
/* Will complain and die if username not found */
- myname = xstrdup(bb_getpwuid(NULL, -1, myuid));
+ myname = xuid2uname(myuid);
name = argv[0] ? argv[0] : myname;
pw = getpwnam(name);
--- busybox.old/networking/sendmail.c 2008-11-04 22:03:36.000000000 +0100
+++ busybox/networking/sendmail.c 2008-11-05 17:27:39.000000000 +0100
@@ -310,7 +310,7 @@
// username must be defined!
if (!opt_user) {
// N.B. IMHO getenv("USER") can be way easily spoofed!
- opt_user = bb_getpwuid(NULL, -1, getuid());
+ opt_user = xuid2uname(getuid());
}
// SSL ordered? ->
--- busybox.old/coreutils/whoami.c 2008-07-05 21:07:45.000000000 +0200
+++ busybox/coreutils/whoami.c 2008-11-05 17:19:34.000000000 +0100
@@ -20,7 +20,7 @@
bb_show_usage();
/* Will complain and die if username not found */
- puts(bb_getpwuid(NULL, -1, geteuid()));
+ puts(xuid2uname(geteuid()));
return fflush(stdout);
}
--- busybox.old/sysklogd/logger.c 2008-06-13 21:12:23.000000000 +0200
+++ busybox/sysklogd/logger.c 2008-11-05 17:31:16.000000000 +0100
@@ -73,11 +73,8 @@
{
char *str_p, *str_t;
int i = 0;
- char name[80];
-
/* Fill out the name string early (may be overwritten later) */
- bb_getpwuid(name, sizeof(name), geteuid());
- str_t = name;
+ str_t = uid2uname_utoa(geteuid());
/* Parse any options */
getopt32(argv, "p:st:", &str_p, &str_t);
--- busybox.old/loginutils/sulogin.c 2008-07-05 21:07:46.000000000 +0200
+++ busybox/loginutils/sulogin.c 2008-11-05 17:38:00.000000000 +0100
@@ -53,11 +53,7 @@
// bb_askpass() already handles this
// signal(SIGALRM, catchalarm);
- pwd = getpwuid(0);
- if (!pwd) {
- goto auth_error;
- }
-
+ pwd = xgetpwuid(0);
#if ENABLE_FEATURE_SHADOWPASSWDS
{
/* getspnam_r may return 0 yet set result to NULL.
@@ -65,7 +61,7 @@
struct spwd *result = NULL;
int r = getspnam_r(pwd->pw_name, &spw, buffer, sizeof(buffer), &result);
if (r || !result) {
- goto auth_error;
+ bb_error_msg_and_die("no password entry for root");
}
pwd->pw_passwd = result->sp_pwdp;
}
@@ -110,7 +106,4 @@
}
/* Exec login shell with no additional parameters. Never returns. */
run_shell(shell, 1, NULL, NULL);
-
- auth_error:
- bb_error_msg_and_die("no password entry for root");
}
--- busybox.old/loginutils/vlock.c 2008-07-22 13:43:09.000000000 +0200
+++ busybox/loginutils/vlock.c 2008-11-05 17:40:19.000000000 +0100
@@ -38,14 +38,9 @@
struct termios term;
struct termios oterm;
struct vt_mode ovtm;
- uid_t uid;
struct passwd *pw;
-/* XXX: xgetpwuid */
- uid = getuid();
- pw = getpwuid(uid);
- if (pw == NULL)
- bb_error_msg_and_die("unknown uid %d", (int)uid);
+ pw = xgetpwuid(getuid());
opt_complementary = "=0"; /* no params! */
getopt32(argv, "a");
--- busybox.old/printutils/lpr.c 2008-07-23 00:57:43.000000000 +0200
+++ busybox/printutils/lpr.c 2008-11-05 17:29:22.000000000 +0100
@@ -65,7 +65,7 @@
const char *server = "localhost"; // server[:port] of printer queue
char *hostname;
// N.B. IMHO getenv("USER") can be way easily spoofed!
- const char *user = bb_getpwuid(NULL, -1, getuid());
+ const char *user = xuid2uname(getuid());
unsigned job;
unsigned opts;
int fd;
--- busybox.old/miscutils/crontab.c 2008-09-21 22:37:21.000000000 +0200
+++ busybox/miscutils/crontab.c 2008-11-05 17:42:44.000000000 +0100
@@ -130,11 +130,7 @@
if (!pas)
bb_error_msg_and_die("user %s is not known", user_name);
} else {
-/* XXX: xgetpwuid */
- uid_t my_uid = getuid();
- pas = getpwuid(my_uid);
- if (!pas)
- bb_perror_msg_and_die("unknown uid %d", (int)my_uid);
+ pas = xgetpwuid(getuid());
}
#define user_name DONT_USE_ME_BEYOND_THIS_POINT
_______________________________________________
busybox mailing list
[email protected]
http://busybox.net/cgi-bin/mailman/listinfo/busybox
