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 /miscutils/mountpoint.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 'miscutils/mountpoint.c')
| -rw-r--r-- | miscutils/mountpoint.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c index 6265a20e1..3e5fb4b46 100644 --- a/miscutils/mountpoint.c +++ b/miscutils/mountpoint.c | |||
| @@ -10,10 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include "busybox.h" | 12 | #include "busybox.h" |
| 13 | #include <sys/stat.h> | ||
| 14 | #include <errno.h> /* errno */ | ||
| 15 | #include <string.h> /* strerror */ | ||
| 16 | #include <getopt.h> /* optind */ | ||
| 17 | 13 | ||
| 18 | int mountpoint_main(int argc, char **argv) | 14 | int mountpoint_main(int argc, char **argv) |
| 19 | { | 15 | { |
| @@ -46,7 +42,7 @@ int mountpoint_main(int argc, char **argv) | |||
| 46 | if (S_ISDIR(st.st_mode)) { | 42 | if (S_ISDIR(st.st_mode)) { |
| 47 | dev_t st_dev = st.st_dev; | 43 | dev_t st_dev = st.st_dev; |
| 48 | ino_t st_ino = st.st_ino; | 44 | ino_t st_ino = st.st_ino; |
| 49 | char *p = bb_xasprintf("%s/..", arg); | 45 | char *p = xasprintf("%s/..", arg); |
| 50 | 46 | ||
| 51 | if (stat(p, &st) == 0) { | 47 | if (stat(p, &st) == 0) { |
| 52 | short ret = (st_dev != st.st_dev) || | 48 | short ret = (st_dev != st.st_dev) || |