X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=modutils%2Flsmod.c;h=b6656369306b3e44b56775046e27d36250810db6;hb=e357d2ae6833e3ca306f3aa6e12c6ddf2ff1eae2;hp=27fabc1feee08c760ec8d1fe02fa777dcbe5249a;hpb=269bba25149289201055c9448e8c64fc05dbf89d;p=oweals%2Fbusybox.git

diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 27fabc1fe..b66563693 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -2,39 +2,78 @@
 /*
  * Mini lsmod implementation for busybox
  *
- * Copyright (C) 1999 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.h>
+#include "libbb.h"
 
+#if ENABLE_FEATURE_CHECK_TAINTED_MODULE
+enum {
+	TAINT_PROPRIETORY_MODULE = (1 << 0),
+	TAINT_FORCED_MODULE      = (1 << 1),
+	TAINT_UNSAFE_SMP         = (1 << 2),
+};
 
-extern int lsmod_main(int argc, char **argv)
+static void check_tainted(void)
 {
-#if defined BB_FEATURE_USE_DEVPS_PATCH
-	char *cmd[] = { "cat", "/dev/modules", "\0" };
+	int tainted = 0;
+	char *buf = xmalloc_open_read_close("/proc/sys/kernel/tainted", NULL);
+	if (buf) {
+		tainted = atoi(buf);
+		if (ENABLE_FEATURE_CLEAN_UP)
+			free(buf);
+	}
+
+	if (tainted) {
+		printf("    Tainted: %c%c%c\n",
+				tainted & TAINT_PROPRIETORY_MODULE      ? 'P' : 'G',
+				tainted & TAINT_FORCED_MODULE           ? 'F' : ' ',
+				tainted & TAINT_UNSAFE_SMP              ? 'S' : ' ');
+	} else {
+		puts("    Not tainted");
+	}
+}
 #else
-#if ! defined BB_FEATURE_USE_PROCFS
-#error Sorry, I depend on the /proc filesystem right now.
-#endif
-	char *cmd[] = { "cat", "/proc/modules", "\0" };
+static void check_tainted(void) { putchar('\n'); }
 #endif
 
-	exit(cat_main(3, cmd));
+int lsmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+#if ENABLE_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+	char *token[4];
+	parser_t *parser = config_open("/proc/modules");
+	printf("Module                  Size  Used by"); //vda!
+	check_tainted();
+
+	if (ENABLE_FEATURE_2_4_MODULES
+	 && get_linux_version_code() < KERNEL_VERSION(2,6,0)
+	) {
+		while (config_read(parser, token, 4, 3, "# \t", PARSE_NORMAL)) {
+			if (token[3] != NULL && token[3][0] == '[') {
+				token[3]++;
+				token[3][strlen(token[3])-1] = '\0';
+			} else
+				token[3] = (char *) "";
+			printf("%-19s %8s %2s %s\n", token[0], token[1], token[2], token[3]);
+		}
+	} else {
+		while (config_read(parser, token, 4, 4, "# \t", PARSE_NORMAL & ~PARSE_GREEDY)) {
+			// N.B. token[3] is either '-' (module is not used by others)
+			// or comma-separated list ended by comma
+			// so trimming the trailing char is just what we need!
+			token[3][strlen(token[3])-1] = '\0';
+			printf("%-19s %8s %2s %s\n", token[0], token[1], token[2], token[3]);
+		}
+	}
+	if (ENABLE_FEATURE_CLEAN_UP)
+		config_close(parser);
+#else
+	check_tainted();
+	xprint_and_close_file(xfopen_for_read("/proc/modules"));
+#endif
+	return EXIT_SUCCESS;
 }