summaryrefslogtreecommitdiff
path: root/util-linux/mount.c
diff options
context:
space:
mode:
authorRob Landley2006-06-15 15:49:36 +0000
committerRob Landley2006-06-15 15:49:36 +0000
commit22d26fc6ae2af584482deaf92f25bb6a7261ad78 (patch)
tree3e9e7c2b43314acdd1f4db7e3a89a3c69daf814a /util-linux/mount.c
parentd6e5083d16c940e36312f4a1b52317dcfc32c011 (diff)
downloadbusybox-22d26fc6ae2af584482deaf92f25bb6a7261ad78.zip
busybox-22d26fc6ae2af584482deaf92f25bb6a7261ad78.tar.gz
Patch from Yann Morin to put BLKGETSIZE64 in platform.h had rather a lot of
fallout due to the #include <sys/mount.h>. Removed that #include from various applets and fixed up those that were unhappy when that #include was made because they'd block copied stuff out of it. (Sigh.)
Diffstat (limited to 'util-linux/mount.c')
-rw-r--r--util-linux/mount.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index e1c1c60..9225289 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -13,7 +13,7 @@
* bb_getopt_ulflags();
*/
-/* Design notes: There is no spec for this. Remind me to write one.
+/* Design notes: There is no spec for mount. Remind me to write one.
mount_main() calls singlemount() which calls mount_it_now().
@@ -22,18 +22,14 @@
mount_it_now() does the actual mount.
*/
-#include <limits.h>
-#include <stdlib.h>
+#include "busybox.h"
#include <unistd.h>
#include <errno.h>
#include <string.h>
-#include <stdio.h>
#include <mntent.h>
#include <ctype.h>
-#include <sys/mount.h>
#include <fcntl.h> // for CONFIG_FEATURE_MOUNT_LOOP
#include <sys/ioctl.h> // for CONFIG_FEATURE_MOUNT_LOOP
-#include "busybox.h"
// These two aren't always defined in old headers
#ifndef MS_BIND