diff options
| author | Rob Landley | 2006-08-03 15:41:12 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-08-03 15:41:12 +0000 |
| commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
| tree | e4a2769349867c441cf2983d83097bb66701a733 /util-linux/nfsmount.c | |
| parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) | |
| download | busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz | |
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 'util-linux/nfsmount.c')
| -rw-r--r-- | util-linux/nfsmount.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index 705975d..e7d194f 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c @@ -26,10 +26,6 @@ */ #include "busybox.h" -#include <unistd.h> -#include <string.h> -#include <errno.h> -#include <time.h> #include <sys/utsname.h> #undef TRUE #undef FALSE @@ -391,7 +387,7 @@ int nfsmount(const char *spec, const char *node, int *flags, } sprintf(new_opts, "%s%saddr=%s", old_opts, *old_opts ? "," : "", s); - *mount_opts = bb_xstrdup(new_opts); + *mount_opts = xstrdup(new_opts); /* Set default options. * rsize/wsize (and bsize, for ver >= 3) are left 0 in order to @@ -459,7 +455,7 @@ int nfsmount(const char *spec, const char *node, int *flags, else if (!strcmp(opt, "mountport")) mountport = val; else if (!strcmp(opt, "mounthost")) - mounthost=bb_xstrndup(opteq+1, + mounthost=xstrndup(opteq+1, strcspn(opteq+1," \t\n\r,")); else if (!strcmp(opt, "mountprog")) mountprog = val; @@ -729,7 +725,7 @@ int nfsmount(const char *spec, const char *node, int *flags, if (!bg) goto fail; if (!running_bg) { - prev_bg_host = bb_xstrdup(hostname); + prev_bg_host = xstrdup(hostname); if (retry > 0) retval = EX_BG; goto fail; |