udhcpd: code shrink - do not fetch requested IP twice

[oweals/busybox.git] / modutils / lsmod.c

diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index cc6b6162f8813eb9fe3ba1eaa5401467534215a9..39dc8e6b713ec0c8bd6dd5f79c0cc12c59d303a6 100644 (file)
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -5,8 +5,37 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config LSMOD
+//config:      bool "lsmod (1.9 kb)"
+//config:      default y
+//config:      select PLATFORM_LINUX
+//config:      help
+//config:      lsmod is used to display a list of loaded modules.
+//config:
+//config:config FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+//config:      bool "Pretty output"
+//config:      default y
+//config:      depends on LSMOD && !MODPROBE_SMALL
+//config:      help
+//config:      This option makes output format of lsmod adjusted to
+//config:      the format of module-init-tools for Linux kernel 2.6.
+//config:      Increases size somewhat.
+
+//applet:IF_LSMOD(IF_NOT_MODPROBE_SMALL(APPLET_NOEXEC(lsmod, lsmod, BB_DIR_SBIN, BB_SUID_DROP, lsmod)))
+
+//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
+//kbuild:lib-$(CONFIG_LSMOD) += lsmod.o modutils.o
+//kbuild:endif
+
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define lsmod_trivial_usage
+//usage:       ""
+//usage:#define lsmod_full_usage "\n\n"
+//usage:       "List loaded kernel modules"
+//usage:#endif
+
 #include "libbb.h"
 #include "unicode.h"
 
@@ -37,7 +66,10 @@ static void check_tainted(void)
        }
 }
 #else
-static void check_tainted(void) { putchar('\n'); }
+static ALWAYS_INLINE void check_tainted(void)
+{
+       putchar('\n');
+}
 #endif
 
 int lsmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -46,9 +78,6 @@ int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #if ENABLE_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
        char *token[4];
        parser_t *parser = config_open("/proc/modules");
-# if ENABLE_FEATURE_ASSUME_UNICODE
-       size_t name_len;
-# endif
        init_unicode();
 
        printf("%-24sSize  Used by", "Module");
@@ -63,10 +92,14 @@ int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                                token[3][strlen(token[3])-1] = '\0';
                        } else
                                token[3] = (char *) "";
-# if ENABLE_FEATURE_ASSUME_UNICODE
-                       name_len = unicode_strlen(token[0]);
-                       name_len = (name_len > 19) ? 0 : 19 - name_len;
-                       printf("%s%*s %8s %2s %s\n", token[0], name_len, "", token[1], token[2], token[3]);
+# if ENABLE_UNICODE_SUPPORT
+                       {
+                               uni_stat_t uni_stat;
+                               char *uni_name = unicode_conv_to_printable(&uni_stat, token[0]);
+                               unsigned pad_len = (uni_stat.unicode_width > 19) ? 0 : 19 - uni_stat.unicode_width;
+                               printf("%s%*s %8s %2s %s\n", uni_name, pad_len, "", token[1], token[2], token[3]);
+                               free(uni_name);
+                       }
 # else
                        printf("%-19s %8s %2s %s\n", token[0], token[1], token[2], token[3]);
 # endif
@@ -76,11 +109,16 @@ int lsmod_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                        // N.B. token[3] is either '-' (module is not used by others)
                        // or comma-separated list ended by comma
                        // so trimming the trailing char is just what we need!
-                       token[3][strlen(token[3])-1] = '\0';
-# if ENABLE_FEATURE_ASSUME_UNICODE
-                       name_len = unicode_strlen(token[0]);
-                       name_len = (name_len > 19) ? 0 : 19 - name_len;
-                       printf("%s%*s %8s %2s %s\n", token[0], name_len, "", token[1], token[2], token[3]);
+                       if (token[3][0])
+                               token[3][strlen(token[3]) - 1] = '\0';
+# if ENABLE_UNICODE_SUPPORT
+                       {
+                               uni_stat_t uni_stat;
+                               char *uni_name = unicode_conv_to_printable(&uni_stat, token[0]);
+                               unsigned pad_len = (uni_stat.unicode_width > 19) ? 0 : 19 - uni_stat.unicode_width;
+                               printf("%s%*s %8s %2s %s\n", uni_name, pad_len, "", token[1], token[2], token[3]);
+                               free(uni_name);
+                       }
 # else
                        printf("%-19s %8s %2s %s\n", token[0], token[1], token[2], token[3]);
 # endif