diff options
| author | Rob Landley <rob@landley.net> | 2006-08-03 15:41:12 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-08-03 15:41:12 +0000 |
| commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
| tree | e4a2769349867c441cf2983d83097bb66701a733 /loginutils/su.c | |
| parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) | |
| download | busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.bz2 busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip | |
Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only
had one user), clean up lots of #includes... General cleanup pass. What I've
been doing for the last couple days.
And it conflicts! I've removed httpd.c from this checkin due to somebody else
touching that file. It builds for me. I have to catch a bus. (Now you know
why I'm looking forward to Mercurial.)
Diffstat (limited to 'loginutils/su.c')
| -rw-r--r-- | loginutils/su.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/loginutils/su.c b/loginutils/su.c index 660ec6f51..6410e748f 100644 --- a/loginutils/su.c +++ b/loginutils/su.c | |||
| @@ -6,11 +6,7 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include "busybox.h" | 8 | #include "busybox.h" |
| 9 | #include <signal.h> | ||
| 10 | #include <syslog.h> | 9 | #include <syslog.h> |
| 11 | #include <sys/resource.h> | ||
| 12 | #include <time.h> | ||
| 13 | |||
| 14 | 10 | ||
| 15 | int su_main ( int argc, char **argv ) | 11 | int su_main ( int argc, char **argv ) |
| 16 | { | 12 | { |
| @@ -43,7 +39,7 @@ int su_main ( int argc, char **argv ) | |||
| 43 | the user, especially if someone su's from a su-shell. | 39 | the user, especially if someone su's from a su-shell. |
| 44 | But getlogin can fail -- usually due to lack of utmp entry. | 40 | But getlogin can fail -- usually due to lack of utmp entry. |
| 45 | in this case resort to getpwuid. */ | 41 | in this case resort to getpwuid. */ |
| 46 | old_user = bb_xstrdup(USE_FEATURE_UTMP(getlogin() ? : ) (pw = getpwuid(cur_uid)) ? pw->pw_name : ""); | 42 | old_user = xstrdup(USE_FEATURE_UTMP(getlogin() ? : ) (pw = getpwuid(cur_uid)) ? pw->pw_name : ""); |
| 47 | tty = ttyname(2) ? : "none"; | 43 | tty = ttyname(2) ? : "none"; |
| 48 | openlog(bb_applet_name, 0, LOG_AUTH); | 44 | openlog(bb_applet_name, 0, LOG_AUTH); |
| 49 | } | 45 | } |