emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modinfo: support relative paths in modules.dep

Browse Source 
function                                             old     new   delta
modinfo                                              272     329     +57
modinfo_main                                         325     344     +19

Signed-off-by: Lauri Kasanen <curaga@operamail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Lauri Kasanen 2010-06-27 00:35:49 +02:00 committed by Denys Vlasenko
parent f6464000ca
commit 1b14cdb27c
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modutils/modinfo.c
View File

@ -43,7 +43,8 @@ static int display(const char *data, const char *pattern, int flag)
return printf("%s%c", data, (option_mask32 & OPT_0) ? '\0' : '\n'); return printf("%s%c", data, (option_mask32 & OPT_0) ? '\0' : '\n');
} }
static void modinfo(const char *path, struct modinfo_env *env) static void modinfo(const char *path, const char *version,
struct modinfo_env *env)
{ {
static const char *const shortcuts[] = { static const char *const shortcuts[] = {
"filename", "filename",
@ -62,10 +63,20 @@ static void modinfo(const char *path, struct modinfo_env *env)
if (tags & 1) { /* filename */ if (tags & 1) { /* filename */
display(path, shortcuts[0], 1 != tags); display(path, shortcuts[0], 1 != tags);
} }
len = MAXINT(ssize_t); len = MAXINT(ssize_t);
the_module = xmalloc_open_zipped_read_close(path, &len); the_module = xmalloc_open_zipped_read_close(path, &len);
if (!the_module) if (!the_module) {
return; if (path[0] == '/')
return;
/* Newer depmod puts relative paths in modules.dep */
path = xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, version, path);
the_module = xmalloc_open_zipped_read_close(path, &len);
free((char*)path);
if (!the_module)
return;
}
if (field) if (field)
tags |= OPT_F; tags |= OPT_F;
for (j = 1; (1<<j) & (OPT_TAGS + OPT_F); j++) { for (j = 1; (1<<j) & (OPT_TAGS + OPT_F); j++) {
@ -109,7 +120,7 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
struct modinfo_env env; struct modinfo_env env;
char name[MODULE_NAME_LEN]; char name[MODULE_NAME_LEN];
struct utsname uts; struct utsname uts;
parser_t *p; parser_t *parser;
char *colon, *tokens[2]; char *colon, *tokens[2];
unsigned opts; unsigned opts;
unsigned i; unsigned i;
@ -121,14 +132,12 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
argv += optind; argv += optind;
uname(&uts); uname(&uts);
p = config_open2( parser = config_open2(
concat_path_file( xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, uts.release, CONFIG_DEFAULT_DEPMOD_FILE),
concat_path_file(CONFIG_DEFAULT_MODULES_DIR, uts.release),
CONFIG_DEFAULT_DEPMOD_FILE),
xfopen_for_read xfopen_for_read
); );
while (config_read(p, tokens, 2, 1, "# \t", PARSE_NORMAL)) { while (config_read(parser, tokens, 2, 1, "# \t", PARSE_NORMAL)) {
colon = last_char_is(tokens[0], ':'); colon = last_char_is(tokens[0], ':');
if (colon == NULL) if (colon == NULL)
continue; continue;
@ -136,15 +145,19 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
filename2modname(tokens[0], name); filename2modname(tokens[0], name);
for (i = 0; argv[i]; i++) { for (i = 0; argv[i]; i++) {
if (fnmatch(argv[i], name, 0) == 0) { if (fnmatch(argv[i], name, 0) == 0) {
modinfo(tokens[0], &env); modinfo(tokens[0], uts.release, &env);
argv[i] = (char *) ""; argv[i] = (char *) "";
} }
} }
} }
if (ENABLE_FEATURE_CLEAN_UP)
config_close(parser);
for (i = 0; argv[i]; i++) { for (i = 0; argv[i]; i++) {
if (argv[i][0]) { if (argv[i][0]) {
modinfo(argv[i], &env); modinfo(argv[i], uts.release, &env);
} }
} }
return 0; return 0;
} }