X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=umount.c;h=3e23b9705edf3e660f277fca16eadf945d496ded;hb=4949faf4b2090ca23c2aeb34535fdbe57754913a;hp=0f087e197e8ae0b9cf320a220f27841d07460943;hpb=5b911ddd577373dfcbd3d2dade7089ff611ea35e;p=oweals%2Fbusybox.git diff --git a/umount.c b/umount.c index 0f087e197..3e23b9705 100644 --- a/umount.c +++ b/umount.c @@ -3,7 +3,7 @@ * Mini umount implementation for busybox * * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000,2001 by Lineo, inc. * Written by Erik Andersen , * * This program is free software; you can redistribute it and/or modify @@ -22,26 +22,24 @@ * */ -#include "internal.h" #include -#include #include -#include #include +#include +#include +#include "busybox.h" -static const char umount_usage[] = - "umount [flags] filesystem|directory\n\n" - "Flags:\n" "\t-a:\tUnmount all file systems" -#ifdef BB_MTAB - " in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n" -#else - "\n" -#endif -#ifdef BB_FEATURE_REMOUNT - "\t-r:\tTry to remount devices as read-only if mount is busy\n" -#endif -; +static const int MNT_FORCE = 1; +static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */ +static const int MS_REMOUNT = 32; /* Alter flags of a mounted FS. */ +static const int MS_RDONLY = 1; /* Mount read-only. */ + +extern int mount (__const char *__special_file, __const char *__dir, + __const char *__fstype, unsigned long int __rwflag, + __const void *__data); +extern int umount (__const char *__special_file); +extern int umount2 (__const char *__special_file, int __flags); struct _mtab_entry_t { char *device; @@ -53,7 +51,15 @@ static struct _mtab_entry_t *mtab_cache = NULL; +#if defined BB_FEATURE_MOUNT_FORCE +static int doForce = FALSE; +#endif +#if defined BB_FEATURE_MOUNT_LOOP +static int freeLoop = TRUE; +#endif +#if defined BB_FEATURE_MTAB_SUPPORT static int useMtab = TRUE; +#endif static int umountAll = FALSE; static int doRemount = FALSE; extern const char mtab_file[]; /* Defined in utility.c */ @@ -77,12 +83,11 @@ void mtab_read(void) return; if ((fp = setmntent(mtab_file, "r")) == NULL) { - fprintf(stderr, "Cannot open %s\n", mtab_file); + error_msg("Cannot open %s", mtab_file); return; } while ((e = getmntent(fp))) { - entry = malloc(sizeof(struct _mtab_entry_t)); - + entry = xmalloc(sizeof(struct _mtab_entry_t)); entry->device = strdup(e->mnt_fsname); entry->mountpt = strdup(e->mnt_dir); entry->next = mtab_cache; @@ -101,13 +106,12 @@ char *mtab_getinfo(const char *match, const char which) if (which == MTAB_GETMOUNTPT) { return cur->mountpt; } else { -#if !defined BB_MTAB +#if !defined BB_FEATURE_MTAB_SUPPORT if (strcmp(cur->device, "/dev/root") == 0) { - struct fstab *fstabItem; - - fstabItem = getfsfile("/"); - if (fstabItem != NULL) - return fstabItem->fs_spec; + /* Adjusts device to be the real root device, + * or leaves device alone if it can't find it */ + find_real_root_device_name( cur->device); + return ( cur->device); } #endif return cur->device; @@ -140,6 +144,9 @@ char *mtab_next(void **iter) return mp; } +/* Don't bother to clean up, since exit() does that + * automagically, so we can save a few bytes */ +#ifdef BB_FEATURE_CLEAN_UP void mtab_free(void) { struct _mtab_entry_t *this, *next; @@ -155,8 +162,9 @@ void mtab_free(void) this = next; } } +#endif -static int do_umount(const char *name, int useMtab) +static int do_umount(const char *name) { int status; char *blockDevice = mtab_getinfo(name, MTAB_GETDEVICE); @@ -167,26 +175,29 @@ static int do_umount(const char *name, int useMtab) status = umount(name); #if defined BB_FEATURE_MOUNT_LOOP - if (blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9)) + if (freeLoop == TRUE && blockDevice != NULL && !strncmp("/dev/loop", blockDevice, 9)) /* this was a loop device, delete it */ del_loop(blockDevice); #endif -#if defined BB_FEATURE_REMOUNT +#if defined BB_FEATURE_MOUNT_FORCE + if (status != 0 && doForce == TRUE) { + status = umount2(blockDevice, MNT_FORCE); + if (status != 0) { + error_msg_and_die("forced umount of %s failed!", blockDevice); + } + } +#endif if (status != 0 && doRemount == TRUE && errno == EBUSY) { status = mount(blockDevice, name, NULL, MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); if (status == 0) { - fprintf(stderr, "umount: %s busy - remounted read-only\n", - blockDevice); - /* TODO: update mtab if BB_MTAB is defined */ + error_msg("%s busy - remounted read-only", blockDevice); } else { - fprintf(stderr, "umount: Cannot remount %s read-only\n", - blockDevice); + error_msg("Cannot remount %s read-only", blockDevice); } } -#endif if (status == 0) { -#if defined BB_MTAB +#if defined BB_FEATURE_MTAB_SUPPORT if (useMtab == TRUE) erase_mtab(name); #endif @@ -195,7 +206,7 @@ static int do_umount(const char *name, int useMtab) return (FALSE); } -static int umount_all(int useMtab) +static int umount_all(void) { int status = TRUE; char *mountpt; @@ -205,18 +216,18 @@ static int umount_all(int useMtab) /* Never umount /proc on a umount -a */ if (strstr(mountpt, "proc")!= NULL) continue; - status = do_umount(mountpt, useMtab); - if (status != 0) { + if (!do_umount(mountpt)) { /* Don't bother retrying the umount on busy devices */ if (errno == EBUSY) { - perror(mountpt); + perror_msg("%s", mountpt); + status = FALSE; continue; } - status = do_umount(mountpt, useMtab); - if (status != 0) { + if (!do_umount(mountpt)) { printf("Couldn't umount %s on %s: %s\n", mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE), strerror(errno)); + status = FALSE; } } } @@ -226,8 +237,11 @@ static int umount_all(int useMtab) extern int umount_main(int argc, char **argv) { if (argc < 2) { - usage(umount_usage); + show_usage(); } +#ifdef BB_FEATURE_CLEAN_UP + atexit(mtab_free); +#endif /* Parse any options */ while (--argc > 0 && **(++argv) == '-') { @@ -236,30 +250,40 @@ extern int umount_main(int argc, char **argv) case 'a': umountAll = TRUE; break; -#ifdef BB_MTAB +#if defined BB_FEATURE_MOUNT_LOOP + case 'l': + freeLoop = FALSE; + break; +#endif +#ifdef BB_FEATURE_MTAB_SUPPORT case 'n': useMtab = FALSE; break; #endif -#ifdef BB_FEATURE_REMOUNT +#ifdef BB_FEATURE_MOUNT_FORCE + case 'f': + doForce = TRUE; + break; +#endif case 'r': doRemount = TRUE; break; -#endif + case 'v': + break; /* ignore -v */ default: - usage(umount_usage); + show_usage(); } } mtab_read(); if (umountAll == TRUE) { - exit(umount_all(useMtab)); - } - if (do_umount(*argv, useMtab) == 0) - exit(TRUE); - else { - perror("umount"); - exit(FALSE); + if (umount_all() == TRUE) + return EXIT_SUCCESS; + else + return EXIT_FAILURE; } + if (do_umount(*argv) == TRUE) + return EXIT_SUCCESS; + perror_msg_and_die("%s", *argv); }