summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2005-08-14 18:46:34 +0000
committerRob Landley2005-08-14 18:46:34 +0000
commit6e98521d68bdc931ddcbcd80ee299f823ed735f0 (patch)
tree8bd62e2046c79c577fe5d004e43a6cd83a059da5
parent58a651b2e59eaeeeb426a58bf8063f860044a2fa (diff)
downloadbusybox-6e98521d68bdc931ddcbcd80ee299f823ed735f0.zip
busybox-6e98521d68bdc931ddcbcd80ee299f823ed735f0.tar.gz
Stephane Billiart noticed that the return code of the new mount was horked.
(Cleaned up the return code path to consistently use numbers so I don't keep confusing EXIT_SUCCESS with TRUE and EXIT_FAILURE with FALSE...)
-rw-r--r--util-linux/mount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 924d79d..c3c13ba 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -123,7 +123,7 @@ extern int mount_main(int argc, char **argv)
*loopFile = 0, *buf = 0,
*files[] = {"/etc/filesystems", "/proc/filesystems", 0};
int i, opt, all = FALSE, fakeIt = FALSE, allowWrite = FALSE,
- rc = EXIT_FAILURE, useMtab = ENABLE_FEATURE_MTAB_SUPPORT;
+ rc = 1, useMtab = ENABLE_FEATURE_MTAB_SUPPORT;
int flags=0xc0ed0000; // Needed for linux 2.2, ignored by 2.4 and 2.6.
FILE *file = 0,*f = 0;
char path[PATH_MAX*2];
@@ -284,7 +284,7 @@ singlemount:
if(nfsmount(blockDevice, directory, &flags, &string_flags, 1))
bb_perror_msg("nfsmount failed");
else {
- rc=EXIT_SUCCESS;
+ rc = 0;
fsType="nfs";
}
} else {
@@ -380,7 +380,7 @@ mount_it_now:
if(ENABLE_FEATURE_CLEAN_UP) free(loopFile);
}
// Don't whine about already mounted fs when mounting all.
- if(rc<0 && errno == EBUSY && all) rc=0;
+ if(rc<0 && errno == EBUSY && all) rc = 0;
else if (errno == EPERM)
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
}
@@ -396,5 +396,5 @@ mount_it_now:
if(file) endmntent(file);
if(rc) bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);
- return rc ? : EXIT_FAILURE;
+ return rc;
}