emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stephane Billiart noticed that the return code of the new mount was horked.

Browse Source 
(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...)
This commit is contained in:
Rob Landley 2005-08-14 18:46:34 +00:00
parent 58a651b2e5
commit 6e98521d68
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util-linux/mount.c
View File

@ -123,7 +123,7 @@ extern int mount_main(int argc, char **argv)
*loopFile = 0, *buf = 0, *loopFile = 0, *buf = 0,
*files[] = {"/etc/filesystems", "/proc/filesystems", 0}; *files[] = {"/etc/filesystems", "/proc/filesystems", 0};
int i, opt, all = FALSE, fakeIt = FALSE, allowWrite = FALSE, 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. int flags=0xc0ed0000; // Needed for linux 2.2, ignored by 2.4 and 2.6.
FILE *file = 0,*f = 0; FILE *file = 0,*f = 0;
char path[PATH_MAX*2]; char path[PATH_MAX*2];
@ -284,7 +284,7 @@ singlemount:
if(nfsmount(blockDevice, directory, &flags, &string_flags, 1)) if(nfsmount(blockDevice, directory, &flags, &string_flags, 1))
bb_perror_msg("nfsmount failed"); bb_perror_msg("nfsmount failed");
else { else {
rc=EXIT_SUCCESS; rc = 0;
fsType="nfs"; fsType="nfs";
} }
} else { } else {
@ -380,7 +380,7 @@ mount_it_now:
if(ENABLE_FEATURE_CLEAN_UP) free(loopFile); if(ENABLE_FEATURE_CLEAN_UP) free(loopFile);
} }
// Don't whine about already mounted fs when mounting all. // 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) else if (errno == EPERM)
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
} }
@ -396,5 +396,5 @@ mount_it_now:
if(file) endmntent(file); if(file) endmntent(file);
if(rc) bb_perror_msg("Mounting %s on %s failed", blockDevice, directory); if(rc) bb_perror_msg("Mounting %s on %s failed", blockDevice, directory);
return rc ? : EXIT_FAILURE; return rc;
} }