diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-02 22:56:59 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-02 22:56:59 +0000 |
commit | 0c68a874e7d996c62c8d00b0c0289180bdce1590 (patch) | |
tree | 57a06bc9317dd24ccf417874c2ecfb10b056adb2 /loginutils | |
parent | b6ddee242592ffd02c05ae3ed6127c1dd80d7580 (diff) | |
download | busybox-w32-0c68a874e7d996c62c8d00b0c0289180bdce1590.tar.gz busybox-w32-0c68a874e7d996c62c8d00b0c0289180bdce1590.tar.bz2 busybox-w32-0c68a874e7d996c62c8d00b0c0289180bdce1590.zip |
libbb: password/group function helpers rewritten by Tito:
function old new delta
xgetpwuid - 27 +27
uid2uname_utoa - 22 +22
gid2group_utoa - 22 +22
uid2uname - 18 +18
gid2group - 18 +18
buffer_fill_and_print 179 196 +17
print_user 12 24 +12
print_group 12 24 +12
get_cached 89 99 +10
...
print_common 134 120 -14
vlock_main 415 396 -19
logger_main 410 387 -23
crontab_main 642 609 -33
bb_getpwuid 42 - -42
bb_getgrgid 42 - -42
bb_getug 80 - -80
------------------------------------------------------------------------------
(add/remove: 6/3 grow/shrink: 9/11 up/down: 187/-296) Total: -109 bytes
Diffstat (limited to 'loginutils')
-rw-r--r-- | loginutils/passwd.c | 2 | ||||
-rw-r--r-- | loginutils/vlock.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/loginutils/passwd.c b/loginutils/passwd.c index 99fb76eca..b156ab5af 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c | |||
@@ -115,7 +115,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv) | |||
115 | bb_show_usage(); | 115 | bb_show_usage(); |
116 | 116 | ||
117 | /* Will complain and die if username not found */ | 117 | /* Will complain and die if username not found */ |
118 | myname = xstrdup(bb_getpwuid(NULL, -1, myuid)); | 118 | myname = xstrdup(xuid2uname(myuid)); |
119 | name = argv[0] ? argv[0] : myname; | 119 | name = argv[0] ? argv[0] : myname; |
120 | 120 | ||
121 | pw = getpwnam(name); | 121 | pw = getpwnam(name); |
diff --git a/loginutils/vlock.c b/loginutils/vlock.c index 0262da5bd..85f489c22 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c | |||
@@ -38,14 +38,9 @@ int vlock_main(int argc UNUSED_PARAM, char **argv) | |||
38 | struct termios term; | 38 | struct termios term; |
39 | struct termios oterm; | 39 | struct termios oterm; |
40 | struct vt_mode ovtm; | 40 | struct vt_mode ovtm; |
41 | uid_t uid; | ||
42 | struct passwd *pw; | 41 | struct passwd *pw; |
43 | /* XXX: xgetpwuid */ | ||
44 | uid = getuid(); | ||
45 | pw = getpwuid(uid); | ||
46 | if (pw == NULL) | ||
47 | bb_error_msg_and_die("unknown uid %d", (int)uid); | ||
48 | 42 | ||
43 | pw = xgetpwuid(getuid()); | ||
49 | opt_complementary = "=0"; /* no params! */ | 44 | opt_complementary = "=0"; /* no params! */ |
50 | getopt32(argv, "a"); | 45 | getopt32(argv, "a"); |
51 | 46 | ||