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

- improve option-handling a bit

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer
2008-05-26 21:33:05 +00:00
parent 7a5f494cab
commit 1ea2568469
1 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
modutils/depmod.c
View File

@@ -11,6 +11,12 @@
#include <libbb.h> #include <libbb.h>
#include <sys/utsname.h> /* uname() */ #include <sys/utsname.h> /* uname() */
#ifndef DEFAULT_MODULES_DIR
#define DEFAULT_MODULES_DIR "/lib/modules"
#endif
#ifndef DEFAULT_DEPMOD_FILE
#define DEFAULT_DEPMOD_FILE "modules.dep"
#endif
/* /*
* Theory of operation: * Theory of operation:
* - iterate over all modules and record their full path * - iterate over all modules and record their full path
@@ -106,7 +112,7 @@ int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv) int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
{ {
int retval = EXIT_SUCCESS; int retval = EXIT_SUCCESS;
char *moddir_base, *system_map, *chp; char *moddir_base = NULL, *moddir, *system_map, *chp;
FILE *filedes = stdout; FILE *filedes = stdout;
enum { enum {
ARG_a = (1<<0), /* All modules, ignore mods in argv */ ARG_a = (1<<0), /* All modules, ignore mods in argv */
@@ -119,36 +125,49 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
getopt32(argv, "aAb:eF:n", &moddir_base, &system_map); getopt32(argv, "aAb:eF:n", &moddir_base, &system_map);
argv += optind; argv += optind;
if (*argv) /* got a version to use? */ if (*argv) {/* got a version to use? */
chp = *argv++; chp = *argv++;
else { // if (memchr(chp, '/', strlen(chp)) != NULL) /* XXX: drop this */
// bb_show_usage();
} else {
struct utsname uts; struct utsname uts;
if (uname(&uts) < 0) if (uname(&uts) < 0)
bb_simple_perror_msg_and_die("uname"); bb_simple_perror_msg_and_die("uname");
chp = xstrdup(uts.release); chp = xstrdup(uts.release);
} }
moddir_base /* if no modules are given on the command-line, -a is on per default */
= concat_path_file(option_mask32 & ARG_b ? moddir_base : "/lib/modules", option_mask32 |= *argv == NULL;
chp);
if (ENABLE_FEATURE_CLEAN_UP) moddir = concat_path_file(DEFAULT_MODULES_DIR, chp);
free(chp); // if (ENABLE_FEATURE_CLEAN_UP)
if (!(option_mask32 & ARG_n)) { // free(chp);
char *modules_dep = concat_path_file(moddir_base, "modules.dep"); if (option_mask32 & ARG_b) {
filedes = xfopen(modules_dep, "w"); char *old_moddir = moddir;
moddir = concat_path_file(moddir_base, moddir);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(modules_dep); free(old_moddir);
} }
if (!(option_mask32 & ARG_n)) { /* --dry-run */
chp = concat_path_file(moddir, DEFAULT_DEPMOD_FILE);
filedes = xfopen(chp, "w");
if (ENABLE_FEATURE_CLEAN_UP)
free(chp);
}
/* have to do a full walk to collect all needed data */
if (!recursive_action(moddir,
ACTION_RECURSE, /* flags */
fill_lst, /* file action */
NULL, /* dir action */
NULL, /* user data */
0)) {
retval = EXIT_FAILURE;
} else
do { do {
chp = concat_path_file(moddir_base, chp = concat_path_file(option_mask32 & ARG_a ? moddir : moddir_base,
option_mask32 & ARG_a ? "/" : *argv++); option_mask32 & ARG_a ? "" : *argv++);
if (!recursive_action(chp, if (!recursive_action(chp,
ACTION_RECURSE, /* flags */
fill_lst, /* file action */
NULL, /* dir action */
NULL, /* user data */
0) || /* depth */
!recursive_action(chp,
ACTION_RECURSE, /* flags */ ACTION_RECURSE, /* flags */
fileAction, /* file action */ fileAction, /* file action */
NULL, /* dir action */ NULL, /* dir action */
@@ -158,12 +177,12 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
} }
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(chp); free(chp);
} while (!(option_mask32 & ARG_a) || *argv); } while (!(option_mask32 & ARG_a) && *argv);
if (ENABLE_FEATURE_CLEAN_UP) { if (ENABLE_FEATURE_CLEAN_UP) {
fclose(filedes); fclose(filedes);
llist_free(G.lst, free); llist_free(G.lst, free);
free(moddir_base); free(moddir);
} }
return retval; return retval;
} }