X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=util-linux%2Fumount.c;h=0662cea1b48c4e6b3c4db6cfe4910731c6d39b3d;hb=319fe129a15278193625eeb05752511d576c5588;hp=6ba72aed1fb99cf494085f973f9de7ffe8eb5ce7;hpb=1119972f917db59ccb7c74daebf5a0688e9d0e24;p=oweals%2Fbusybox.git diff --git a/util-linux/umount.c b/util-linux/umount.c index 6ba72aed1..0662cea1b 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -8,24 +8,42 @@ * Licensed under GPL version 2, see file LICENSE in this tarball for details. */ -#include "busybox.h" #include -#include +#include "libbb.h" -#define OPTION_STRING "flDnravd" -#define OPT_FORCE 1 -#define OPT_LAZY 2 -#define OPT_DONTFREELOOP 4 -#define OPT_NO_MTAB 8 -#define OPT_REMOUNT 16 -#define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0) - -int umount_main(int argc, char **argv) +#if defined(__dietlibc__) +/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) + * dietlibc-0.30 does not have implementation of getmntent_r() */ +static struct mntent *getmntent_r(FILE* stream, struct mntent* result, + char* buffer UNUSED_PARAM, int bufsize UNUSED_PARAM) +{ + struct mntent* ment = getmntent(stream); + return memcpy(result, ment, sizeof(*ment)); +} +#endif + +/* ignored: -v -d -t -i */ +#define OPTION_STRING "fldnra" "vdt:i" +#define OPT_FORCE (1 << 0) +#define OPT_LAZY (1 << 1) +#define OPT_FREELOOP (1 << 2) +#define OPT_NO_MTAB (1 << 3) +#define OPT_REMOUNT (1 << 4) +#define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 5) : 0) + +// These constants from linux/fs.h must match OPT_FORCE and OPT_LAZY, +// otherwise "doForce" trick below won't work! +//#define MNT_FORCE 0x00000001 /* Attempt to forcibly umount */ +//#define MNT_DETACH 0x00000002 /* Just detach from the tree */ + +int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int umount_main(int argc UNUSED_PARAM, char **argv) { int doForce; - char path[2*PATH_MAX]; + char *const path = xmalloc(PATH_MAX + 2); /* to save stack */ struct mntent me; FILE *fp; + char *fstype = NULL; int status = EXIT_SUCCESS; unsigned opt; struct mtab_list { @@ -34,13 +52,9 @@ int umount_main(int argc, char **argv) struct mtab_list *next; } *mtl, *m; - /* Parse any options */ - - opt = getopt32(argc, argv, OPTION_STRING); - - argc -= optind; + opt = getopt32(argv, OPTION_STRING, &fstype); + //argc -= optind; argv += optind; - doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY)); /* Get a list of mount points from mtab. We read them all in now mostly @@ -48,18 +62,19 @@ int umount_main(int argc, char **argv) * 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 * umounts the most recent entries first. */ + m = mtl = NULL; - m = mtl = 0; - - /* 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). */ - + // 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). fp = setmntent(bb_path_mtab_file, "r"); if (!fp) { if (opt & OPT_ALL) - bb_error_msg_and_die("cannot open %s", bb_path_mtab_file); + bb_error_msg_and_die("can't open %s", bb_path_mtab_file); } else { - while (getmntent_r(fp, &me, path, sizeof(path))) { + while (getmntent_r(fp, &me, path, PATH_MAX)) { + /* Match fstype if passed */ + if (fstype && match_fstype(&me, fstype)) + continue; m = xmalloc(sizeof(struct mtab_list)); m->next = mtl; m->device = xstrdup(me.mnt_fsname); @@ -69,10 +84,11 @@ int umount_main(int argc, char **argv) endmntent(fp); } - /* If we're not umounting all, we need at least one argument. */ - if (!(opt & OPT_ALL)) { - m = 0; - if (!argc) bb_show_usage(); + // If we're not umounting all, we need at least one argument. + if (!(opt & OPT_ALL) && !fstype) { + if (!argv[0]) + bb_show_usage(); + m = NULL; } // Loop through everything we're supposed to umount, and do so. @@ -81,12 +97,15 @@ int umount_main(int argc, char **argv) char *zapit = *argv; // 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. - else if (opt & OPT_ALL) break; - // Get next command line argument (and look it up in mtab list) - else if (!argc--) break; + else if (opt & OPT_ALL) + break; + // Use command line argument (and look it up in mtab list) else { + if (!zapit) + break; argv++; realpath(zapit, path); for (m = mtl; m; m = m->next) @@ -102,26 +121,29 @@ int umount_main(int argc, char **argv) curstat = umount(zapit); // Force the unmount, if necessary. - if (curstat && doForce) { + if (curstat && doForce) curstat = umount2(zapit, doForce); - if (curstat) - bb_error_msg("forced umount of %s failed!", zapit); - } // If still can't umount, maybe remount read-only? - if (curstat && (opt & OPT_REMOUNT) && errno == EBUSY && m) { - curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL); - bb_error_msg(curstat ? "cannot remount %s read-only" : - "%s busy - remounted read-only", m->device); - } - if (curstat) { - status = EXIT_FAILURE; - bb_perror_msg("cannot umount %s", zapit); + if ((opt & OPT_REMOUNT) && errno == EBUSY && m) { + // Note! Even if we succeed here, later we should not + // free loop device or erase mtab entry! + const char *msg = "%s busy - remounted read-only"; + curstat = mount(m->device, zapit, NULL, MS_REMOUNT|MS_RDONLY, NULL); + if (curstat) { + msg = "can't remount %s read-only"; + status = EXIT_FAILURE; + } + bb_error_msg(msg, m->device); + } else { + status = EXIT_FAILURE; + bb_perror_msg("can't %sumount %s", (doForce ? "forcibly " : ""), zapit); + } } else { - /* De-allocate the loop device. This ioctl should be ignored on - * any non-loop block devices. */ - if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONTFREELOOP) && m) + // De-allocate the loop device. This ioctl should be ignored on + // any non-loop block devices. + if (ENABLE_FEATURE_MOUNT_LOOP && (opt & OPT_FREELOOP) && m) del_loop(m->device); if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m) erase_mtab(m->dir); @@ -130,13 +152,12 @@ int umount_main(int argc, char **argv) // Find next matching mtab entry for -a or umount /dev // Note this means that "umount /dev/blah" will unmount all instances // of /dev/blah, not just the most recent. - while (m && (m = m->next)) + if (m) while ((m = m->next) != NULL) if ((opt & OPT_ALL) || !strcmp(path, m->device)) break; } // Free mtab list if necessary - if (ENABLE_FEATURE_CLEAN_UP) { while (mtl) { m = mtl->next; @@ -145,6 +166,7 @@ int umount_main(int argc, char **argv) free(mtl); mtl = m; } + free(path); } return status;