more bugs fixed -- found doing regression testing

[oweals/busybox.git] / lsmod.c

diff --git a/lsmod.c b/lsmod.c
index a4a0ece0ef5a9c884cd9289e4da4adf9074176d9..41575585fcd13f395b70abbd05b7e1c48b0d9bb6 100644 (file)
--- a/lsmod.c
+++ b/lsmod.c
@@ -5,6 +5,10 @@
  * Copyright (C) 1999,2000 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,7 +25,7 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -32,8 +36,11 @@
 #include <assert.h>
 #include <getopt.h>
 #include <sys/utsname.h>
+#include <sys/file.h>
+
 
 
+#ifdef BB_FEATURE_NEW_MODULE_INTERFACE
 
 struct module_info
 {
@@ -48,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)
@@ -72,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");
@@ -83,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) {
@@ -91,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);
                }
@@ -120,3 +127,30 @@ extern int lsmod_main(int argc, char **argv)
 
        return( 0);
 }
+
+#else /*BB_FEATURE_OLD_MODULE_INTERFACE*/
+
+#if ! defined BB_FEATURE_USE_PROCFS
+#error Sorry, I depend on the /proc filesystem right now.
+#endif
+
+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*/