X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=lsmod.c;h=c97d199a69e40d262cd86011ac05cc9b52998dc8;hb=5165fbed639916e0fde15a827241b21981be7934;hp=6fe505bf65fffe6ac3c1f50074781b433c44e1e3;hpb=21adca750a9a1ae47da2bd058574795089406f25;p=oweals%2Fbusybox.git

diff --git a/lsmod.c b/lsmod.c
index 6fe505bf6..c97d199a6 100644
--- a/lsmod.c
+++ b/lsmod.c
@@ -2,7 +2,7 @@
 /*
  * 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
@@ -25,7 +25,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -37,14 +36,11 @@
 #include <getopt.h>
 #include <sys/utsname.h>
 #include <sys/file.h>
+#include "busybox.h"
 
 
 
-#if !defined(BB_FEATURE_LSMOD_NEW_KERNEL) && !defined(BB_FEATURE_LSMOD_OLD_KERNEL)
-#error "Must have ether BB_FEATURE_LSMOD_NEW_KERNEL or BB_FEATURE_LSMOD_OLD_KERNEL defined"
-#endif
-
-#ifdef BB_FEATURE_LSMOD_NEW_KERNEL
+#ifdef BB_FEATURE_NEW_MODULE_INTERFACE
 
 struct module_info
 {
@@ -59,19 +55,19 @@ 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;
 
 
 extern int lsmod_main(int argc, char **argv)
@@ -83,7 +79,7 @@ extern int lsmod_main(int argc, char **argv)
 	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));
+		perror_msg_and_die("QM_MODULES");
 	}
 
 	printf("Module                  Size  Used by\n");
@@ -94,7 +90,7 @@ 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 (errno == ENOENT) {
@@ -102,7 +98,7 @@ extern int lsmod_main(int argc, char **argv)
 				continue;
 			}
 			if (errno != ENOSPC) {
-				fatalError("module %s: QM_REFS: %s", mn, strerror(errno));
+				error_msg_and_die("module %s: QM_REFS", mn);
 			}
 			deps = xrealloc(deps, bufsize = count);
 		}
@@ -132,11 +128,7 @@ extern int lsmod_main(int argc, char **argv)
 	return( 0);
 }
 
-#else /*BB_FEATURE_LSMOD_OLD_KERNEL*/
-
-#if ! defined BB_FEATURE_USE_PROCFS
-#error Sorry, I depend on the /proc filesystem right now.
-#endif
+#else /*BB_FEATURE_OLD_MODULE_INTERFACE*/
 
 extern int lsmod_main(int argc, char **argv)
 {
@@ -153,8 +145,8 @@ extern int lsmod_main(int argc, char **argv)
 		close(fd);
 		return 0;
 	}
-	fatalError("/proc/modules: %s\n", strerror(errno));
+	perror_msg_and_die("/proc/modules");
 	return 1;
 }
 
-#endif /*BB_FEATURE_LSMOD_OLD_KERNEL*/
+#endif /*BB_FEATURE_OLD_MODULE_INTERFACE*/