X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=umount.c;h=3e23b9705edf3e660f277fca16eadf945d496ded;hb=4949faf4b2090ca23c2aeb34535fdbe57754913a;hp=df075f7d9f14e413fdbc999cbe508285b6d3b90a;hpb=bf181b9338152759fd56c8009e9a962a84808e7c;p=oweals%2Fbusybox.git

diff --git a/umount.c b/umount.c
index df075f7d9..3e23b9705 100644
--- a/umount.c
+++ b/umount.c
@@ -3,7 +3,7 @@
  * Mini umount implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,16 +22,18 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <mntent.h>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include "busybox.h"
 
 
-#define MNT_FORCE		1
-#define MS_MGC_VAL		0xc0ed0000 /* Magic number indicatng "new" flags */
-#define MS_REMOUNT		32	/* Alter flags of a mounted FS.  */
-#define MS_RDONLY		1	/* Mount read-only.  */
+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,
@@ -55,7 +57,9 @@ static int doForce = FALSE;
 #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 */
@@ -79,7 +83,7 @@ void mtab_read(void)
 		return;
 
 	if ((fp = setmntent(mtab_file, "r")) == NULL) {
-		errorMsg("Cannot open %s\n", mtab_file);
+		error_msg("Cannot open %s", mtab_file);
 		return;
 	}
 	while ((e = getmntent(fp))) {
@@ -102,7 +106,7 @@ 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) {
 					/* Adjusts device to be the real root device,
 					 * or leaves device alone if it can't find it */
@@ -142,7 +146,7 @@ char *mtab_next(void **iter)
 
 /* Don't bother to clean up, since exit() does that 
  * automagically, so we can save a few bytes */
-#if 0
+#ifdef BB_FEATURE_CLEAN_UP
 void mtab_free(void)
 {
 	struct _mtab_entry_t *this, *next;
@@ -160,7 +164,7 @@ void mtab_free(void)
 }
 #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);
@@ -179,7 +183,7 @@ static int do_umount(const char *name, int useMtab)
 	if (status != 0 && doForce == TRUE) {
 		status = umount2(blockDevice, MNT_FORCE);
 		if (status != 0) {
-			fatalError("forced umount of %s failed!\n", blockDevice);
+			error_msg_and_die("forced umount of %s failed!", blockDevice);
 		}
 	}
 #endif
@@ -187,13 +191,13 @@ static int do_umount(const char *name, int useMtab)
 		status = mount(blockDevice, name, NULL,
 					   MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
 		if (status == 0) {
-			errorMsg("%s busy - remounted read-only\n", blockDevice);
+			error_msg("%s busy - remounted read-only", blockDevice);
 		} else {
-			errorMsg("Cannot remount %s read-only\n", blockDevice);
+			error_msg("Cannot remount %s read-only", blockDevice);
 		}
 	}
 	if (status == 0) {
-#if defined BB_MTAB
+#if defined BB_FEATURE_MTAB_SUPPORT
 		if (useMtab == TRUE)
 			erase_mtab(name);
 #endif
@@ -202,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;
@@ -212,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;
 			}
 		}
 	}
@@ -233,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) == '-') {
@@ -248,7 +255,7 @@ extern int umount_main(int argc, char **argv)
 				freeLoop = FALSE;
 				break;
 #endif
-#ifdef BB_MTAB
+#ifdef BB_FEATURE_MTAB_SUPPORT
 			case 'n':
 				useMtab = FALSE;
 				break;
@@ -264,17 +271,19 @@ extern int umount_main(int argc, char **argv)
 			case 'v':
 				break; /* ignore -v */
 			default:
-				usage(umount_usage);
+				show_usage();
 			}
 	}
 
 	mtab_read();
 	if (umountAll == TRUE) {
-		exit(umount_all(useMtab));
+		if (umount_all() == TRUE)
+			return EXIT_SUCCESS;
+		else
+			return EXIT_FAILURE;
 	}
-	if (do_umount(*argv, useMtab) == 0)
-		exit(TRUE);
-	perror("umount");
-	return(FALSE);
+	if (do_umount(*argv) == TRUE)
+		return EXIT_SUCCESS;
+	perror_msg_and_die("%s", *argv);
 }