/*
* Mini umount implementation for busybox
*
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <stdlib.h>
#include "busybox.h"
-/* Teach libc5 about realpath -- it includes it but the
+/* Teach libc5 about realpath -- it includes it but the
* prototype is missing... */
#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
extern char *realpath(const char *path, char *resolved_path);
return cur->mountpt;
} else {
#if !defined CONFIG_FEATURE_MTAB_SUPPORT
- if (strcmp(cur->device, "/dev/root") == 0) {
+ if (strcmp(cur->device, "rootfs") == 0) {
+ continue;
+ } else if (strcmp(cur->device, "/dev/root") == 0) {
/* Adjusts device to be the real root device,
* or leaves device alone if it can't find it */
- cur->device = find_real_root_device_name(cur->device);
+ cur->device = find_real_root_device_name();
}
#endif
return cur->device;
return mtab_next(iter);
}
-/* Don't bother to clean up, since exit() does that
+/* Don't bother to clean up, since exit() does that
* automagically, so we can save a few bytes */
#ifdef CONFIG_FEATURE_CLEAN_UP
static void mtab_free(void)
extern int umount_main(int argc, char **argv)
{
- char path[PATH_MAX];
+ char path[PATH_MAX], result = 0;
if (argc < 2) {
bb_show_usage();
else
return EXIT_FAILURE;
}
- if (realpath(*argv, path) == NULL)
- bb_perror_msg_and_die("%s", path);
- if (do_umount(path))
- return EXIT_SUCCESS;
- bb_perror_msg_and_die("%s", *argv);
-}
+ do {
+ if (realpath(*argv, path) != NULL)
+ if (do_umount(path))
+ continue;
+ bb_perror_msg("%s", path);
+ result++;
+ } while (--argc > 0 && ++argv);
+ return result;
+}