1 files changed, 32 insertions, 72 deletions

diff --git a/release/src/router/busybox/libbb/mtab.c b/release/src/router/busybox/libbb/mtab.c
index 28c9978e..586a6619 100644
--- a/release/src/router/busybox/libbb/mtab.c
+++ b/release/src/router/busybox/libbb/mtab.c
@@ -1,95 +1,55 @@
 /* vi: set sw=4 ts=4: */
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
 #include <mntent.h>
 #include "libbb.h"
 
-extern const char mtab_file[];	/* Defined in utility.c */
-static const int MS_RDONLY = 1;	/* Mount read-only.  */
-
-void erase_mtab(const char *name)
+#if ENABLE_FEATURE_MTAB_SUPPORT
+void FAST_FUNC erase_mtab(const char *name)
 {
-	struct mntent entries[20];
-	int count = 0;
-	FILE *mountTable = setmntent(mtab_file, "r");
+	struct mntent *entries;
+	int i, count;
+	FILE *mountTable;
 	struct mntent *m;
 
-	/* Check if reading the mtab file failed */
-	if (mountTable == 0
-			/* Bummer.  fall back on trying the /proc filesystem */
-			&& (mountTable = setmntent("/proc/mounts", "r")) == 0) {
-		perror_msg("%s", mtab_file);
+	mountTable = setmntent(bb_path_mtab_file, "r");
+	/* Bummer. Fall back on trying the /proc filesystem */
+	if (!mountTable) mountTable = setmntent("/proc/mounts", "r");
+	if (!mountTable) {
+		bb_perror_msg(bb_path_mtab_file);
 		return;
 	}
 
+	entries = NULL;
+	count = 0;
 	while ((m = getmntent(mountTable)) != 0) {
-		entries[count].mnt_fsname = strdup(m->mnt_fsname);
-		entries[count].mnt_dir = strdup(m->mnt_dir);
-		entries[count].mnt_type = strdup(m->mnt_type);
-		entries[count].mnt_opts = strdup(m->mnt_opts);
+		entries = xrealloc_vector(entries, 3, count);
+		entries[count].mnt_fsname = xstrdup(m->mnt_fsname);
+		entries[count].mnt_dir = xstrdup(m->mnt_dir);
+		entries[count].mnt_type = xstrdup(m->mnt_type);
+		entries[count].mnt_opts = xstrdup(m->mnt_opts);
 		entries[count].mnt_freq = m->mnt_freq;
 		entries[count].mnt_passno = m->mnt_passno;
 		count++;
 	}
 	endmntent(mountTable);
-	if ((mountTable = setmntent(mtab_file, "w"))) {
-		int i;
 
+//TODO: make update atomic
+	mountTable = setmntent(bb_path_mtab_file, "w");
+	if (mountTable) {
 		for (i = 0; i < count; i++) {
-			int result = (strcmp(entries[i].mnt_fsname, name) == 0
-						  || strcmp(entries[i].mnt_dir, name) == 0);
-
-			if (result)
-				continue;
-			else
+			if (strcmp(entries[i].mnt_fsname, name) != 0
+			 && strcmp(entries[i].mnt_dir, name) != 0)
 				addmntent(mountTable, &entries[i]);
 		}
 		endmntent(mountTable);
 	} else if (errno != EROFS)
-		perror_msg("%s", mtab_file);
-}
-
-void write_mtab(char *blockDevice, char *directory,
-				char *filesystemType, long flags, char *string_flags)
-{
-	FILE *mountTable = setmntent(mtab_file, "a+");
-	struct mntent m;
-
-	if (mountTable == 0) {
-		perror_msg("%s", mtab_file);
-		return;
-	}
-	if (mountTable) {
-		int length = strlen(directory);
-
-		if (length > 1 && directory[length - 1] == '/')
-			directory[length - 1] = '\0';
-
-		if (filesystemType == 0) {
-			struct mntent *p = find_mount_point(blockDevice, "/proc/mounts");
-
-			if (p && p->mnt_type)
-				filesystemType = p->mnt_type;
-		}
-		m.mnt_fsname = blockDevice;
-		m.mnt_dir = directory;
-		m.mnt_type = filesystemType ? filesystemType : "default";
-
-		if (*string_flags) {
-			m.mnt_opts = string_flags;
-		} else {
-			if ((flags | MS_RDONLY) == flags)
-				m.mnt_opts = "ro";
-			else
-				m.mnt_opts = "rw";
-		}
-
-		m.mnt_freq = 0;
-		m.mnt_passno = 0;
-		addmntent(mountTable, &m);
-		endmntent(mountTable);
-	}
+		bb_perror_msg(bb_path_mtab_file);
 }
+#endif