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

better check usage with options, correct show problem error message, indent

Browse Source
This commit is contained in:
"Vladimir N. Oleynik" 2005-10-10 12:17:33 +00:00
parent 083d3f49c2
commit 54cb5c6af3
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
util-linux/umount.c
View File

@ -4,7 +4,7 @@
* *
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
* Copyright (C) 2005 by Rob Landley <rob@landley.net> * Copyright (C) 2005 by Rob Landley <rob@landley.net>
* *
* This program is licensed under the GNU General Public license (GPL) * This program is licensed under the GNU General Public license (GPL)
* version 2 or later, see http://www.fsf.org/licensing/licenses/gpl.html * version 2 or later, see http://www.fsf.org/licensing/licenses/gpl.html
* or the file "LICENSE" in the busybox source tarball for the full text. * or the file "LICENSE" in the busybox source tarball for the full text.
@ -25,11 +25,11 @@
#define OPT_FORCE 1 #define OPT_FORCE 1
#define OPT_LAZY 2 #define OPT_LAZY 2
#define OPT_ALL 4 #define OPT_ALL 4
#define OPT_DONTFREELOOP 8 #define OPT_DONTFREELOOP 8
#define OPT_NO_MTAB 16 #define OPT_NO_MTAB 16
#define OPT_REMOUNT 32 #define OPT_REMOUNT 32
/* -v is ignored */ /* -v is ignored */
extern int umount_main(int argc, char **argv) extern int umount_main(int argc, char **argv)
{ {
@ -42,26 +42,24 @@ extern int umount_main(int argc, char **argv)
struct mtab_list { struct mtab_list {
char *dir; char *dir;
char *device; char *device;
struct mtab_list *next; struct mtab_list *next;
} *mtl, *m; } *mtl, *m;
if(argc < 2) bb_show_usage();
/* Parse any options */ /* Parse any options */
opt = bb_getopt_ulflags (argc, argv, "flaDnrv"); opt = bb_getopt_ulflags (argc, argv, OPTION_STRING);
argc -= optind; argc -= optind;
argv += optind; argv += optind;
doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY)); doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
/* Get a list of mount points from mtab. We read them all in now mostly /* Get a list of mount points from mtab. We read them all in now mostly
* for umount -a (so we don't have to worry about the list changing while * for umount -a (so we don't have to worry about the list changing while
* we iterate over it, or about getting stuck in a loop on the same failing * we iterate over it, or about getting stuck in a loop on the same failing
* entry. Notice that this also naturally reverses the list so that -a * entry. Notice that this also naturally reverses the list so that -a
* umounts the most recent entries first. */ * umounts the most recent entries first. */
m=mtl=0; m=mtl=0;
if(!(fp = setmntent(bb_path_mtab_file, "r"))) if(!(fp = setmntent(bb_path_mtab_file, "r")))
bb_error_msg_and_die("Cannot open %s", bb_path_mtab_file); bb_error_msg_and_die("Cannot open %s", bb_path_mtab_file);
@ -76,12 +74,15 @@ extern int umount_main(int argc, char **argv)
/* If we're umounting all, then m points to the start of the list and /* If we're umounting all, then m points to the start of the list and
* the argument list should be empty (which will match all). */ * the argument list should be empty (which will match all). */
if(!(opt & OPT_ALL)) m=0; if(!(opt & OPT_ALL)) {
m=0;
if(argc <= 0) bb_show_usage();
}
// Loop through everything we're supposed to umount, and do so. // Loop through everything we're supposed to umount, and do so.
for(;;) { for(;;) {
int curstat; int curstat;
// Do we already know what to umount this time through the loop? // Do we already know what to umount this time through the loop?
if(m) safe_strncpy(path,m->dir,PATH_MAX); if(m) safe_strncpy(path,m->dir,PATH_MAX);
// For umount -a, end of mtab means time to exit. // For umount -a, end of mtab means time to exit.
@ -106,7 +107,7 @@ extern int umount_main(int argc, char **argv)
bb_error_msg_and_die("forced umount of %s failed!", path); bb_error_msg_and_die("forced umount of %s failed!", path);
} }
// If still can't umount, maybe remount read-only? // If still can't umount, maybe remount read-only?
if (curstat && (opt & OPT_REMOUNT) && errno == EBUSY && m) { if (curstat && (opt & OPT_REMOUNT) && errno == EBUSY && m) {
curstat = mount(m->device, path, NULL, MS_REMOUNT|MS_RDONLY, NULL); curstat = mount(m->device, path, NULL, MS_REMOUNT|MS_RDONLY, NULL);
bb_error_msg(curstat ? "Cannot remount %s read-only" : bb_error_msg(curstat ? "Cannot remount %s read-only" :
@ -124,16 +125,16 @@ extern int umount_main(int argc, char **argv)
if(ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m) if(ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
erase_mtab(m->dir); erase_mtab(m->dir);
status = EXIT_FAILURE; status = EXIT_FAILURE;
bb_perror_msg("Couldn't umount %s\n", path); bb_perror_msg("Couldn't umount %s", path);
} }
// Find next matching mtab entry for -a or umount /dev // Find next matching mtab entry for -a or umount /dev
while(m && (m = m->next)) while(m && (m = m->next))
if((opt & OPT_ALL) || !strcmp(path,m->device)) if((opt & OPT_ALL) || !strcmp(path,m->device))
break; break;
} }
// Free mtab list if necessary // Free mtab list if necessary
if(ENABLE_FEATURE_CLEAN_UP) { if(ENABLE_FEATURE_CLEAN_UP) {
while(mtl) { while(mtl) {
m=mtl->next; m=mtl->next;