X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=lsmod.c;h=76ed2fdd8f0ea2d999e3be9d1f0f69103933beee;hb=63ae66198d3f2d51d077a8fbcdaf1e5fe80a210f;hp=945f420e05cd33c77acc218eb83c39e96fca248c;hpb=de34e4375565cbe1b60c2d99afddfb6c7c45b3ad;p=oweals%2Fbusybox.git

diff --git a/lsmod.c b/lsmod.c
index 945f420e0..76ed2fdd8 100644
--- a/lsmod.c
+++ b/lsmod.c
@@ -2,9 +2,13 @@
 /*
  * Mini lsmod 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>
  *
+ * Modified by Alcove, Julien Gaulmin <julien.gaulmin@alcove.fr> and
+ * Nicolas Ferre <nicolas.ferre@alcove.fr> to support pre 2.1 kernels
+ * (which lack the query_module() interface).
+ *
  * 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
@@ -21,9 +25,9 @@
  *
  */
 
-#include "internal.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <stddef.h>
 #include <errno.h>
 #include <unistd.h>
@@ -32,8 +36,12 @@
 #include <assert.h>
 #include <getopt.h>
 #include <sys/utsname.h>
+#include <sys/file.h>
+#include "busybox.h"
+
 
 
+#ifdef BB_FEATURE_NEW_MODULE_INTERFACE
 
 struct module_info
 {
@@ -44,37 +52,53 @@ struct module_info
 };
 
 
-int query_module(const char *name, int which, void *buf, size_t bufsize,
-		 size_t *ret);
+int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret);
 
 /* Values for query_module's which.  */
-#define QM_MODULES	1
-#define QM_DEPS		2
-#define QM_REFS		3
-#define QM_SYMBOLS	4
-#define QM_INFO		5
+static const int QM_MODULES = 1;
+static const int QM_DEPS = 2;
+static const int QM_REFS = 3;
+static const int QM_SYMBOLS = 4;
+static const int QM_INFO = 5;
 
 /* Bits of module.flags.  */
-#define NEW_MOD_RUNNING		1
-#define NEW_MOD_DELETED		2
-#define NEW_MOD_AUTOCLEAN	4
-#define NEW_MOD_VISITED		8
-#define NEW_MOD_USED_ONCE	16
-#define NEW_MOD_INITIALIZING	64
+static const int NEW_MOD_RUNNING = 1;
+static const int NEW_MOD_DELETED = 2;
+static const int NEW_MOD_AUTOCLEAN = 4;
+static const int NEW_MOD_VISITED = 8;
+static const int NEW_MOD_USED_ONCE = 16;
+static const int NEW_MOD_INITIALIZING = 64;
+
+static int my_query_module(const char *name, int which, void **buf,
+		size_t *bufsize, size_t *ret)
+{
+	int my_ret;
+
+	my_ret = query_module(name, which, *buf, *bufsize, ret);
+
+	if (my_ret == -1 && errno == ENOSPC) {
+		*buf = xrealloc(*buf, *ret);
+		*bufsize = *ret;
+
+		my_ret = query_module(name, which, *buf, *bufsize, ret);
+	}
 
+	return my_ret;
+}
 
 extern int lsmod_main(int argc, char **argv)
 {
 	struct module_info info;
 	char *module_names, *mn, *deps, *dn;
-	size_t bufsize, nmod, count, i, j;
+	size_t bufsize, depsize, nmod, count, i, j;
 
 	module_names = xmalloc(bufsize = 256);
-	deps = xmalloc(bufsize);
-	if (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) {
-		fatalError("QM_MODULES: %s\n", strerror(errno));
+	if (my_query_module(NULL, QM_MODULES, (void **)&module_names, &bufsize,
+				&nmod)) {
+		perror_msg_and_die("QM_MODULES");
 	}
 
+	deps = xmalloc(depsize = 256);
 	printf("Module                  Size  Used by\n");
 	for (i = 0, mn = module_names; i < nmod; mn += strlen(mn) + 1, i++) {
 		if (query_module(mn, QM_INFO, &info, sizeof(info), &count)) {
@@ -83,40 +107,60 @@ extern int lsmod_main(int argc, char **argv)
 				continue;
 			}
 			/* else choke */
-			fatalError("module %s: QM_INFO: %s\n", mn, strerror(errno));
+			perror_msg_and_die("module %s: QM_INFO", mn);
 		}
-		while (query_module(mn, QM_REFS, deps, bufsize, &count)) {
+		if (my_query_module(mn, QM_REFS, (void **)&deps, &depsize, &count)) {
 			if (errno == ENOENT) {
 				/* The module was removed out from underneath us. */
 				continue;
 			}
-			if (errno != ENOSPC) {
-				fatalError("module %s: QM_REFS: %s", mn, strerror(errno));
-			}
-			deps = xrealloc(deps, bufsize = count);
+			perror_msg_and_die("module %s: QM_REFS", mn);
 		}
 		printf("%-20s%8lu%4ld ", mn, info.size, info.usecount);
-		if (count) printf("[");
-		for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) {
-			printf("%s%s", dn, (j==count-1)? "":" ");
-		}
-		if (count) printf("]");
-		printf("\n");
-
 		if (info.flags & NEW_MOD_DELETED)
-			printf(" (deleted)");
+			printf("(deleted)");
 		else if (info.flags & NEW_MOD_INITIALIZING)
-			printf(" (initializing)");
+			printf("(initializing)");
 		else if (!(info.flags & NEW_MOD_RUNNING))
-			printf(" (uninitialized)");
+			printf("(uninitialized)");
 		else {
 			if (info.flags & NEW_MOD_AUTOCLEAN)
-				printf(" (autoclean)");
+				printf("(autoclean) ");
 			if (!(info.flags & NEW_MOD_USED_ONCE))
-				printf(" (unused)");
+				printf("(unused)");
 		}
+		if (count) printf("[");
+		for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) {
+			printf("%s%s", dn, (j==count-1)? "":" ");
+		}
+		if (count) printf("] ");
+
+		printf("\n");
 	}
 
 
 	return( 0);
 }
+
+#else /*BB_FEATURE_OLD_MODULE_INTERFACE*/
+
+extern int lsmod_main(int argc, char **argv)
+{
+	int fd, i;
+	char line[128];
+
+	puts("Module                  Size  Used by");
+	fflush(stdout);
+
+	if ((fd = open("/proc/modules", O_RDONLY)) >= 0 ) {
+		while ((i = read(fd, line, sizeof(line))) > 0) {
+			write(fileno(stdout), line, i);
+		}
+		close(fd);
+		return 0;
+	}
+	perror_msg_and_die("/proc/modules");
+	return 1;
+}
+
+#endif /*BB_FEATURE_OLD_MODULE_INTERFACE*/