summaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko2008-12-02 22:56:59 +0000
committerDenis Vlasenko2008-12-02 22:56:59 +0000
commit0c68a874e7d996c62c8d00b0c0289180bdce1590 (patch)
tree57a06bc9317dd24ccf417874c2ecfb10b056adb2 /loginutils
parentb6ddee242592ffd02c05ae3ed6127c1dd80d7580 (diff)
downloadbusybox-0c68a874e7d996c62c8d00b0c0289180bdce1590.zip
busybox-0c68a874e7d996c62c8d00b0c0289180bdce1590.tar.gz
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.c2
-rw-r--r--loginutils/vlock.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 99fb76e..b156ab5 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -115,7 +115,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
bb_show_usage();
/* Will complain and die if username not found */
- myname = xstrdup(bb_getpwuid(NULL, -1, myuid));
+ myname = xstrdup(xuid2uname(myuid));
name = argv[0] ? argv[0] : myname;
pw = getpwnam(name);
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 0262da5..85f489c 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -38,14 +38,9 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
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");