Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/modutils/depmod.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/modutils/depmod.c (modified) (7 diffs)

branches/3.2/mindi-busybox/modutils/depmod.c

@@ -9 +9 @@
  */
 
-//applet:IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP))
-
-//usage:#if !ENABLE_MODPROBE_SMALL
-//usage:#define depmod_trivial_usage NOUSAGE_STR
-//usage:#define depmod_full_usage ""
-//usage:#endif
+//applet:IF_DEPMOD(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP))
 
 #include "libbb.h"
@@ -37 +32 @@
 
 static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
-                  void *data, int depth UNUSED_PARAM)
+                void *data, int depth UNUSED_PARAM)
 {
     char modname[MODULE_NAME_LEN];
@@ -101 +96 @@
 
 static void order_dep_list(module_info *modules, module_info *start,
-               llist_t *add)
+            llist_t *add)
 {
     module_info *m;
@@ -132 +127 @@
 }
 
-/* Usage:
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..."
+//usage:#define depmod_full_usage "\n\n"
+//usage:       "Generate modules.dep, alias, and symbols files"
+//usage:     "\n"
+//usage:     "\n    -b BASE Use BASE/lib/modules/VERSION"
+//usage:     "\n    -n  Dry run: print files to stdout"
+//usage:#endif
+
+/* Upstream usage:
  * [-aAenv] [-C FILE or DIR] [-b BASE] [-F System.map] [VERSION] [MODFILES]...
  *  -a --all
@@ -143 +147 @@
  *      Path to /etc/depmod.conf or /etc/depmod.d/
  *  -e --errsyms
- *      When combined with the -F option, this reports any symbols which
+ *      When combined with the -F option, this reports any symbols
  *      which are not supplied by other modules or kernel.
  *  -F --filesyms System.map
@@ -155 +159 @@
  *  -q  No-op
  *
- * So far we only support: [-rn] [-b BASE] [VERSION] [MODFILES]...
- * -aAeF are accepted but ignored. -vC are not accepted.
+ * So far we only support: [-n] [-b BASE] [VERSION] [MODFILES]...
+ * Accepted but ignored:
+ * -aAe
+ * -F System.map
+ * -C FILE/DIR
+ *
+ * Not accepted: -v
  */
 enum {
@@ -208 +217 @@
     } else {
         recursive_action(".", ACTION_RECURSE,
-                 parse_module, NULL, &modules, 0);
+                parse_module, NULL, &modules, 0);
     }