Move the mtab support stuff into libbb

 -Erik

1 files changed, 0 insertions, 95 deletions

diff --git a/mtab.c b/mtab.c
deleted file mode 100644
index 0497657..0000000
--- a/mtab.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* vi: set sw=4 ts=4: */
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <mntent.h>
-#include "busybox.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)
-{
-	struct mntent entries[20];
-	int count = 0;
-	FILE *mountTable = setmntent(mtab_file, "r");
-	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);
-		return;
-	}
-
-	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[count].mnt_freq = m->mnt_freq;
-		entries[count].mnt_passno = m->mnt_passno;
-		count++;
-	}
-	endmntent(mountTable);
-	if ((mountTable = setmntent(mtab_file, "w"))) {
-		int i;
-
-		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
-				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);
-	}
-}