Kill CONFIG_FEATURE_USE_DEVPS_PATCH and the devps patch. I'm not

maintaining it anymore, and it is now terribly out of date. -Erik
author: Eric Andersen <andersen@codepoet.org> 2002-12-05 07:24:08 +0000
committer: Eric Andersen <andersen@codepoet.org> 2002-12-05 07:24:08 +0000
commit: deca106b6dad70ad0a1312a82d762aa8d8ad52ba (patch)
tree: f11db23c430298ac9da2f3de80ec6c86cc75be70 /util-linux/mount.c
parent: 6f9b45b9eff22c664b93ace82d20669340a762f8 (diff)
download: busybox-w32-deca106b6dad70ad0a1312a82d762aa8d8ad52ba.tar.gz
busybox-w32-deca106b6dad70ad0a1312a82d762aa8d8ad52ba.tar.bz2
busybox-w32-deca106b6dad70ad0a1312a82d762aa8d8ad52ba.zip
1 files changed, 1 insertions, 81 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 829d31666..32d0dd5b9 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -53,9 +53,6 @@
 #include <mntent.h>
 #include <ctype.h>
 #include "busybox.h"
-#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
-#       include <linux/devmtab.h>       /* For Erik's nifty devmtab device driver */
-#endif
 enum {
        MS_MGC_VAL = 0xc0ed0000,        /* Magic number indicatng "new" flags */
@@ -247,39 +244,6 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                                         int mount_all)
 {
        int status = 0;
-#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
-        if (strcmp(filesystemType, "auto") == 0) {
-                static const char *noauto_array[] =
-                        { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs",
-0 };
-                const char **noauto_fstype;
-                const int num_of_filesystems = sysfs(3, 0, 0);
-                char buf[255];
-                int i = 0;
-                filesystemType = buf;
-                while (i < num_of_filesystems) {
-                        sysfs(2, i++, filesystemType);
-                        for (noauto_fstype = noauto_array; *noauto_fstype;
-                                 noauto_fstype++) {
-                                if (!strcmp(filesystemType, *noauto_fstype)) {
-                                        break;
-                                }
-                        }
-                        if (!*noauto_fstype) {
-                                status =
-                                        do_mount(blockDevice, directory, filesystemType,
-                                                         flags | MS_MGC_VAL, string_flags, useMtab,
-                                                         fakeIt, mtab_opts, mount_all);
-                                if (status) {
-                                        break;
-                                }
-                        }
-                }
-        }
-#else
        if (strcmp(filesystemType, "auto") == 0) {
                char buf[255];
                FILE *f;
@@ -346,9 +310,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
                        }
                }
                fclose(f);
-        }
+        } else {
-#endif
-        else {
                status =
                        do_mount(blockDevice, directory, filesystemType,
                                         flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
@@ -366,47 +328,6 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
 static void show_mounts(char *onlytype)
 {
-#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
-        int fd, i, numfilesystems;
-        char device[] = "/dev/mtab";
-        struct k_mntent *mntentlist;
-        /* open device */
-        fd = open(device, O_RDONLY);
-        if (fd < 0) {
-                perror_msg_and_die("open failed for `%s'", device);
-        }
-        /* How many mounted filesystems?  We need to know to 
-         * allocate enough space for later... */
-        numfilesystems = ioctl(fd, DEVMTAB_COUNT_MOUNTS);
-        if (numfilesystems < 0) {
-                perror_msg_and_die("\nDEVMTAB_COUNT_MOUNTS");
-        }
-        mntentlist =
-                (struct k_mntent *) xcalloc(numfilesystems, sizeof(struct k_mntent));
-        /* Grab the list of mounted filesystems */
-        if (ioctl(fd, DEVMTAB_GET_MOUNTS, mntentlist) < 0) {
-                perror_msg_and_die("\nDEVMTAB_GET_MOUNTS");
-        }
-        for (i = 0; i < numfilesystems; i++) {
-                if (!onlytype || (strcmp(mntentlist[i].mnt_type, onlytype) == 0)) {
-                        printf("%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
-                                   mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
-                                   mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
-                                   mntentlist[i].mnt_passno);
-                }
-        }
-#ifdef CONFIG_FEATURE_CLEAN_UP
-        /* Don't bother to close files or free memory.  Exit 
-         * does that automagically, so we can save a few bytes */
-        free(mntentlist);
-        close(fd);
-#endif
-        exit(EXIT_SUCCESS);
-#else
        FILE *mountTable = setmntent(mtab_file, "r");
        if (mountTable) {
@@ -433,7 +354,6 @@ static void show_mounts(char *onlytype)
                perror_msg_and_die("%s", mtab_file);
        }
        exit(EXIT_SUCCESS);
-#endif
 }
 extern int mount_main(int argc, char **argv)
author	Eric Andersen <andersen@codepoet.org>	2002-12-05 07:24:08 +0000
committer	Eric Andersen <andersen@codepoet.org>	2002-12-05 07:24:08 +0000
commit	deca106b6dad70ad0a1312a82d762aa8d8ad52ba (patch)
tree	f11db23c430298ac9da2f3de80ec6c86cc75be70 /util-linux/mount.c
parent	6f9b45b9eff22c664b93ace82d20669340a762f8 (diff)
download	busybox-w32-deca106b6dad70ad0a1312a82d762aa8d8ad52ba.tar.gz busybox-w32-deca106b6dad70ad0a1312a82d762aa8d8ad52ba.tar.bz2 busybox-w32-deca106b6dad70ad0a1312a82d762aa8d8ad52ba.zip

diff --git a/util-linux/mount.c b/util-linux/mount.c index 829d31666..32d0dd5b9 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c
@@ -53,9 +53,6 @@
53	#include <mntent.h>	53	#include <mntent.h>
54	#include <ctype.h>	54	#include <ctype.h>
55	#include "busybox.h"	55	#include "busybox.h"
56	#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
57	# include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
58	#endif
59		56
60	enum {	57	enum {
61	MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */	58	MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
@@ -247,39 +244,6 @@ static int mount_one(char blockDevice, char directory, char *filesystemType,
247	int mount_all)	244	int mount_all)
248	{	245	{
249	int status = 0;	246	int status = 0;
250
251	#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
252	if (strcmp(filesystemType, "auto") == 0) {
253	static const char *noauto_array[] =
254	{ "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs",
255	0 };
256	const char **noauto_fstype;
257	const int num_of_filesystems = sysfs(3, 0, 0);
258	char buf[255];
259	int i = 0;
260
261	filesystemType = buf;
262
263	while (i < num_of_filesystems) {
264	sysfs(2, i++, filesystemType);
265	for (noauto_fstype = noauto_array; *noauto_fstype;
266	noauto_fstype++) {
267	if (!strcmp(filesystemType, *noauto_fstype)) {
268	break;
269	}
270	}
271	if (!*noauto_fstype) {
272	status =
273	do_mount(blockDevice, directory, filesystemType,
274	flags \| MS_MGC_VAL, string_flags, useMtab,
275	fakeIt, mtab_opts, mount_all);
276	if (status) {
277	break;
278	}
279	}
280	}
281	}
282	#else
283	if (strcmp(filesystemType, "auto") == 0) {	247	if (strcmp(filesystemType, "auto") == 0) {
284	char buf[255];	248	char buf[255];
285	FILE *f;	249	FILE *f;
@@ -346,9 +310,7 @@ static int mount_one(char blockDevice, char directory, char *filesystemType,
346	}	310	}
347	}	311	}
348	fclose(f);	312	fclose(f);
349	}	313	} else {
350	#endif
351	else {
352	status =	314	status =
353	do_mount(blockDevice, directory, filesystemType,	315	do_mount(blockDevice, directory, filesystemType,
354	flags \| MS_MGC_VAL, string_flags, useMtab, fakeIt,	316	flags \| MS_MGC_VAL, string_flags, useMtab, fakeIt,
@@ -366,47 +328,6 @@ static int mount_one(char blockDevice, char directory, char *filesystemType,
366		328
367	static void show_mounts(char *onlytype)	329	static void show_mounts(char *onlytype)
368	{	330	{
369	#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
370	int fd, i, numfilesystems;
371	char device[] = "/dev/mtab";
372	struct k_mntent *mntentlist;
373
374	/* open device */
375	fd = open(device, O_RDONLY);
376	if (fd < 0) {
377	perror_msg_and_die("open failed for `%s'", device);
378	}
379
380	/* How many mounted filesystems? We need to know to
381	* allocate enough space for later... */
382	numfilesystems = ioctl(fd, DEVMTAB_COUNT_MOUNTS);
383	if (numfilesystems < 0) {
384	perror_msg_and_die("\nDEVMTAB_COUNT_MOUNTS");
385	}
386	mntentlist =
387	(struct k_mntent *) xcalloc(numfilesystems, sizeof(struct k_mntent));
388
389	/* Grab the list of mounted filesystems */
390	if (ioctl(fd, DEVMTAB_GET_MOUNTS, mntentlist) < 0) {
391	perror_msg_and_die("\nDEVMTAB_GET_MOUNTS");
392	}
393
394	for (i = 0; i < numfilesystems; i++) {
395	if (!onlytype \|\| (strcmp(mntentlist[i].mnt_type, onlytype) == 0)) {
396	printf("%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
397	mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
398	mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
399	mntentlist[i].mnt_passno);
400	}
401	}
402	#ifdef CONFIG_FEATURE_CLEAN_UP
403	/* Don't bother to close files or free memory. Exit
404	* does that automagically, so we can save a few bytes */
405	free(mntentlist);
406	close(fd);
407	#endif
408	exit(EXIT_SUCCESS);
409	#else
410	FILE *mountTable = setmntent(mtab_file, "r");	331	FILE *mountTable = setmntent(mtab_file, "r");
411		332
412	if (mountTable) {	333	if (mountTable) {
@@ -433,7 +354,6 @@ static void show_mounts(char *onlytype)
433	perror_msg_and_die("%s", mtab_file);	354	perror_msg_and_die("%s", mtab_file);
434	}	355	}
435	exit(EXIT_SUCCESS);	356	exit(EXIT_SUCCESS);
436	#endif
437	}	357	}
438		358
439	extern int mount_main(int argc, char **argv)	359	extern int mount_main(int argc, char **argv)