Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/modutils/lsmod.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/modutils/lsmod.c (modified) (6 diffs)

branches/2.2.5/mindi-busybox/modutils/lsmod.c

@@ -12 +12 @@
  */
 
-#include "busybox.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stddef.h>
-#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <assert.h>
-#include <getopt.h>
-#include <sys/utsname.h>
-#include <sys/file.h>
+#include "libbb.h"
 
 
-#ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE
-static inline void check_tainted(void) { printf("\n"); }
+#if !ENABLE_FEATURE_CHECK_TAINTED_MODULE
+static void check_tainted(void) { puts(""); }
 #else
 #define TAINT_FILENAME                  "/proc/sys/kernel/tainted"
@@ -57 +45 @@
 #endif
 
-#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
+#if ENABLE_FEATURE_QUERY_MODULE_INTERFACE
 
 struct module_info
@@ -87 +75 @@
 };
 
+int lsmod_main(int argc, char **argv);
 int lsmod_main(int argc, char **argv)
 {
@@ -93 +82 @@
     size_t bufsize, depsize, nmod, count, i, j;
 
-    module_names = xmalloc(bufsize = 256);
-    if (my_query_module(NULL, QM_MODULES, &module_names, &bufsize, &nmod)) {
-        bb_perror_msg_and_die("QM_MODULES");
+    module_names = deps = NULL;
+    bufsize = depsize = 0;
+    while (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) {
+        if (errno != ENOSPC) bb_perror_msg_and_die("QM_MODULES");
+        module_names = xmalloc(bufsize = nmod);
     }
 
     deps = xmalloc(depsize = 256);
-    printf("Module                  Size  Used by");
+    printf("Module\t\t\tSize  Used by");
     check_tainted();
 
@@ -111 +102 @@
             bb_perror_msg_and_die("module %s: QM_INFO", mn);
         }
-        if (my_query_module(mn, QM_REFS, &deps, &depsize, &count)) {
+        while (query_module(mn, QM_REFS, deps, depsize, &count)) {
             if (errno == ENOENT) {
                 /* The module was removed out from underneath us. */
                 continue;
-            }
-            bb_perror_msg_and_die("module %s: QM_REFS", mn);
+            } else if (errno != ENOSPC)
+                bb_perror_msg_and_die("module %s: QM_REFS", mn);
+            deps = xrealloc(deps, count);
         }
         printf("%-20s%8lu%4ld", mn, info.size, info.usecount);
@@ -137 +129 @@
         if (count) printf("]");
 
-        printf("\n");
+        puts("");
     }
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
+#if ENABLE_FEATURE_CLEAN_UP
     free(module_names);
 #endif
 
-    return( 0);
+    return 0;
 }
 
 #else /* CONFIG_FEATURE_QUERY_MODULE_INTERFACE */
 
+int lsmod_main(int argc, char **argv);
 int lsmod_main(int argc, char **argv)
 {
+    FILE *file = xfopen("/proc/modules", "r");
+
     printf("Module                  Size  Used by");
     check_tainted();
 #if defined(CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT)
     {
-      FILE *file;
-      char line[4096];
+        char *line;
+        while ((line = xmalloc_fgets(file)) != NULL) {
+            char *tok;
 
-      file = bb_xfopen("/proc/modules", "r");
-
-      while (fgets(line, sizeof(line), file)) {
-        char *tok;
-
-        tok = strtok(line, " \t");
-        printf("%-19s", tok);
-        tok = strtok(NULL, " \t\n");
-        printf(" %8s", tok);
-        tok = strtok(NULL, " \t\n");
-        /* Null if no module unloading support. */
-        if (tok) {
-          printf("  %s", tok);
-          tok = strtok(NULL, "\n");
-          if (!tok)
-        tok = "";
-          /* New-style has commas, or -.  If so,
-         truncate (other fields might follow). */
-          else if (strchr(tok, ',')) {
-        tok = strtok(tok, "\t ");
-        /* Strip trailing comma. */
-        if (tok[strlen(tok)-1] == ',')
-          tok[strlen(tok)-1] = '\0';
-          } else if (tok[0] == '-'
-             && (tok[1] == '\0' || isspace(tok[1])))
-        tok = "";
-          printf(" %s", tok);
-        }
-        printf("\n");
-      }
-      fclose(file);
+            tok = strtok(line, " \t");
+            printf("%-19s", tok);
+            tok = strtok(NULL, " \t\n");
+            printf(" %8s", tok);
+            tok = strtok(NULL, " \t\n");
+            /* Null if no module unloading support. */
+            if (tok) {
+                printf("  %s", tok);
+                tok = strtok(NULL, "\n");
+                if (!tok)
+                    tok = (char*)"";
+                /* New-style has commas, or -.  If so,
+                truncate (other fields might follow). */
+                else if (strchr(tok, ',')) {
+                    tok = strtok(tok, "\t ");
+                    /* Strip trailing comma. */
+                    if (tok[strlen(tok)-1] == ',')
+                        tok[strlen(tok)-1] = '\0';
+                } else if (tok[0] == '-'
+                 && (tok[1] == '\0' || isspace(tok[1]))
+                ) {
+                    tok = (char*)"";
+                }
+                printf(" %s", tok);
+            }
+            puts("");
+            free(line);
+        }
+        fclose(file);
     }
+#else
+    xprint_and_close_file(file);
+#endif  /*  CONFIG_FEATURE_2_6_MODULES  */
     return EXIT_SUCCESS;
-#else
-    if (bb_xprint_file_by_name("/proc/modules") == 0)
-        return EXIT_SUCCESS;
-#endif  /*  CONFIG_FEATURE_2_6_MODULES  */
-
-    return EXIT_FAILURE;
 }