diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-04-01 16:01:11 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-04-01 16:01:11 +0000 |
commit | c4cef5ab063d7abb604d48610424566202dcade0 (patch) | |
tree | c661196acbb1adfa81257a7f23b08bd15d653be8 /util-linux/umount.c | |
parent | f77d88641d934fbd9ed0da8c8e31c84dc5856532 (diff) | |
download | busybox-w32-c4cef5ab063d7abb604d48610424566202dcade0.tar.gz busybox-w32-c4cef5ab063d7abb604d48610424566202dcade0.tar.bz2 busybox-w32-c4cef5ab063d7abb604d48610424566202dcade0.zip |
Move the mtab support stuff into libbb
-Erik
Diffstat (limited to '')
-rw-r--r-- | util-linux/umount.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/umount.c b/util-linux/umount.c index cc7d38d7c..3e23b9705 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c | |||
@@ -57,7 +57,7 @@ static int doForce = FALSE; | |||
57 | #if defined BB_FEATURE_MOUNT_LOOP | 57 | #if defined BB_FEATURE_MOUNT_LOOP |
58 | static int freeLoop = TRUE; | 58 | static int freeLoop = TRUE; |
59 | #endif | 59 | #endif |
60 | #if defined BB_MTAB | 60 | #if defined BB_FEATURE_MTAB_SUPPORT |
61 | static int useMtab = TRUE; | 61 | static int useMtab = TRUE; |
62 | #endif | 62 | #endif |
63 | static int umountAll = FALSE; | 63 | static int umountAll = FALSE; |
@@ -106,7 +106,7 @@ char *mtab_getinfo(const char *match, const char which) | |||
106 | if (which == MTAB_GETMOUNTPT) { | 106 | if (which == MTAB_GETMOUNTPT) { |
107 | return cur->mountpt; | 107 | return cur->mountpt; |
108 | } else { | 108 | } else { |
109 | #if !defined BB_MTAB | 109 | #if !defined BB_FEATURE_MTAB_SUPPORT |
110 | if (strcmp(cur->device, "/dev/root") == 0) { | 110 | if (strcmp(cur->device, "/dev/root") == 0) { |
111 | /* Adjusts device to be the real root device, | 111 | /* Adjusts device to be the real root device, |
112 | * or leaves device alone if it can't find it */ | 112 | * or leaves device alone if it can't find it */ |
@@ -197,7 +197,7 @@ static int do_umount(const char *name) | |||
197 | } | 197 | } |
198 | } | 198 | } |
199 | if (status == 0) { | 199 | if (status == 0) { |
200 | #if defined BB_MTAB | 200 | #if defined BB_FEATURE_MTAB_SUPPORT |
201 | if (useMtab == TRUE) | 201 | if (useMtab == TRUE) |
202 | erase_mtab(name); | 202 | erase_mtab(name); |
203 | #endif | 203 | #endif |
@@ -255,7 +255,7 @@ extern int umount_main(int argc, char **argv) | |||
255 | freeLoop = FALSE; | 255 | freeLoop = FALSE; |
256 | break; | 256 | break; |
257 | #endif | 257 | #endif |
258 | #ifdef BB_MTAB | 258 | #ifdef BB_FEATURE_MTAB_SUPPORT |
259 | case 'n': | 259 | case 'n': |
260 | useMtab = FALSE; | 260 | useMtab = FALSE; |
261 | break; | 261 | break; |