From: Pascal Bellard Date: Sun, 6 Jun 2010 02:55:13 +0000 (+0200) Subject: modinfo: new applet X-Git-Tag: 1_17_0~111 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=22bdf90334515e047fcccf36ae80a543b6a056de;p=oweals%2Fbusybox.git modinfo: new applet function old new delta modinfo_main - 307 +307 modinfo - 280 +280 packed_usage 27037 27131 +94 display - 74 +74 static.shortcuts - 24 +24 applet_names 2254 2262 +8 applet_main 1324 1328 +4 applet_nameofs 662 664 +2 ------------------------------------------------------------------------------ (add/remove: 5/0 grow/shrink: 4/0 up/down: 793/0) Total: 793 bytes Signed-off-by: Pascal Bellard Signed-off-by: Denys Vlasenko --- diff --git a/modutils/Config.src b/modutils/Config.src index 3d02f87ee..2ced9b308 100644 --- a/modutils/Config.src +++ b/modutils/Config.src @@ -5,6 +5,8 @@ menu "Linux Module Utilities" +INSERT + config MODPROBE_SMALL bool "Simplified modutils" default y diff --git a/modutils/Kbuild.src b/modutils/Kbuild.src index 31f7cbf93..fc0808d7f 100644 --- a/modutils/Kbuild.src +++ b/modutils/Kbuild.src @@ -5,6 +5,7 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= +INSERT lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o lib-$(CONFIG_DEPMOD) += depmod.o modutils.o lib-$(CONFIG_INSMOD) += insmod.o modutils.o diff --git a/modutils/modinfo.c b/modutils/modinfo.c new file mode 100644 index 000000000..c68d2e974 --- /dev/null +++ b/modutils/modinfo.c @@ -0,0 +1,150 @@ +/* vi: set sw=4 ts=4: */ +/* + * modinfo - retrieve module info + * Copyright (c) 2008 Pascal Bellard + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + */ + +//applet:IF_MODINFO(APPLET(modinfo, _BB_DIR_SBIN, _BB_SUID_DROP)) + +//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o + +//config:config MODINFO +//config: bool "modinfo" +//config: default y +//config: help +//config: Show information about a Linux Kernel module + +#include +#include /* uname() */ +#include "libbb.h" +#include "modutils.h" + + +enum { + OPT_TAGS = (1 << 6) - 1, + OPT_F = (1 << 6), /* field name */ + OPT_0 = (1 << 7), /* \0 as separator */ +}; + +struct modinfo_env { + char *field; + int tags; +}; + +static int display(const char *data, const char *pattern, int flag) +{ + if (flag) { + int n = printf("%s:", pattern); + while (n++ < 16) + bb_putchar(' '); + } + return printf("%s%c", data, (option_mask32 & OPT_0) ? '\0' : '\n'); +} + +static void modinfo(const char *path, struct modinfo_env *env) +{ + static const char *const shortcuts[] = { + "filename", + "description", + "author", + "license", + "vermagic", + "parm", + }; + size_t len; + int j, length; + char *ptr, *the_module; + const char *field = env->field; + int tags = env->tags; + + if (tags & 1) { /* filename */ + display(path, shortcuts[0], 1 != tags); + } + len = MAXINT(ssize_t); + the_module = xmalloc_open_zipped_read_close(path, &len); + if (!the_module) + return; + if (field) + tags |= OPT_F; + for (j = 1; (1<