*
*/
+#include <limits.h>
#include <stdio.h>
#include <mntent.h>
#include <errno.h>
#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 */
* TODO: Perhaps switch to using Glibc's getmntent_r
* -Erik
*/
-void mtab_read(void)
+static void mtab_read(void)
{
struct _mtab_entry_t *entry = NULL;
struct mntent *e;
endmntent(fp);
}
-char *mtab_getinfo(const char *match, const char which)
+static char *mtab_getinfo(const char *match, const char which)
{
struct _mtab_entry_t *cur = mtab_cache;
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) {
/* 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);
+ cur->device = find_real_root_device_name(cur->device);
}
#endif
return cur->device;
return NULL;
}
-char *mtab_first(void **iter)
-{
- struct _mtab_entry_t *mtab_iter;
-
- if (!iter)
- return NULL;
- mtab_iter = mtab_cache;
- *iter = (void *) mtab_iter;
- return mtab_next(iter);
-}
-
-char *mtab_next(void **iter)
+static char *mtab_next(void **iter)
{
char *mp;
return mp;
}
+static char *mtab_first(void **iter)
+{
+ struct _mtab_entry_t *mtab_iter;
+
+ if (!iter)
+ return NULL;
+ mtab_iter = mtab_cache;
+ *iter = (void *) mtab_iter;
+ return mtab_next(iter);
+}
+
/* 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)
+static void mtab_free(void)
{
struct _mtab_entry_t *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);
}
}
if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
if (useMtab == TRUE)
erase_mtab(name);
#endif
return (FALSE);
}
-static int umount_all(int useMtab)
+static int umount_all(void)
{
int status = TRUE;
char *mountpt;
/* Never umount /proc on a umount -a */
if (strstr(mountpt, "proc")!= NULL)
continue;
- if (!do_umount(mountpt, useMtab)) {
+ if (!do_umount(mountpt)) {
/* Don't bother retrying the umount on busy devices */
if (errno == EBUSY) {
perror_msg("%s", mountpt);
status = FALSE;
continue;
}
- if (!do_umount(mountpt, useMtab)) {
+ if (!do_umount(mountpt)) {
printf("Couldn't umount %s on %s: %s\n",
mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
strerror(errno));
extern int umount_main(int argc, char **argv)
{
+ char path[PATH_MAX];
+
if (argc < 2) {
show_usage();
}
freeLoop = FALSE;
break;
#endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
case 'n':
useMtab = FALSE;
break;
mtab_read();
if (umountAll == TRUE) {
- if (umount_all(useMtab) == TRUE)
+ if (umount_all() == TRUE)
return EXIT_SUCCESS;
else
return EXIT_FAILURE;
}
- if (do_umount(*argv, useMtab) == TRUE)
+ if (realpath(*argv, path) == NULL)
+ perror_msg_and_die("%s", path);
+ if (do_umount(path) == TRUE)
return EXIT_SUCCESS;
perror_msg_and_die("%s", *argv);
}