summaryrefslogtreecommitdiff
path: root/loginutils/passwd.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
committerRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
commitd921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch)
treee4a2769349867c441cf2983d83097bb66701a733 /loginutils/passwd.c
parent6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff)
downloadbusybox-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/passwd.c')
-rw-r--r--loginutils/passwd.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 7745444c0..aa75dd260 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -3,20 +3,8 @@
3 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 3 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
4 */ 4 */
5 5
6#include <fcntl.h>
7#include <stdio.h>
8#include <string.h>
9#include <signal.h>
10#include <sys/stat.h>
11#include <sys/types.h>
12#include <unistd.h>
13#include <utime.h>
14#include <syslog.h>
15#include <time.h>
16#include <sys/resource.h>
17#include <errno.h>
18
19#include "busybox.h" 6#include "busybox.h"
7#include <syslog.h>
20 8
21static char crypt_passwd[128]; 9static char crypt_passwd[128];
22 10
@@ -170,7 +158,7 @@ int passwd_main(int argc, char **argv)
170 bb_show_usage(); 158 bb_show_usage();
171 } 159 }
172 } 160 }
173 myname = (char *) bb_xstrdup(bb_getpwuid(NULL, getuid(), -1)); 161 myname = (char *) xstrdup(bb_getpwuid(NULL, getuid(), -1));
174 /* exits on error */ 162 /* exits on error */
175 if (optind < argc) { 163 if (optind < argc) {
176 name = argv[optind]; 164 name = argv[optind];