/[magellan-source]/trunk/mkinitrd-magellan/busybox/modutils/modprobe-small.c

Diff of /trunk/mkinitrd-magellan/busybox/modutils/modprobe-small.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 9
   */
  #include "libbb.h"
+ /* After libbb.h, since it needs sys/types.h on some systems */
  #include <sys/utsname.h> /* uname() */
  #include <fnmatch.h>
 Line 44 
 struct globals {
  	char *module_load_options;
  	smallint dep_bb_seen;
  	smallint wrote_dep_bb_ok;
- 	int module_count;
+ 	unsigned module_count;
  	int module_found_idx;
- 	int stringbuf_idx;
+ 	unsigned stringbuf_idx;
- 	char stringbuf[32 * 1024]; /* some modules have lots of stuff */
+ 	unsigned stringbuf_size;
+ 	char *stringbuf; /* some modules have lots of stuff */
  	/* for example, drivers/media/video/saa7134/saa7134.ko */
+ 	/* therefore having a fixed biggish buffer is not wise */
  };
  #define G (*ptr_to_globals)
  #define modinfo             (G.modinfo            )
-Line 58 
 struct globals {
+Line 60 
 struct globals {
  #define module_found_idx    (G.module_found_idx   )
  #define module_load_options (G.module_load_options)
  #define stringbuf_idx       (G.stringbuf_idx      )
+ #define stringbuf_size      (G.stringbuf_size     )
  #define stringbuf           (G.stringbuf          )
  #define INIT_G() do { \
  	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
  } while (0)
+ static void append(const char *s)
+ {
+ 	unsigned len = strlen(s);
+ 	if (stringbuf_idx + len + 15 > stringbuf_size) {
+ 		stringbuf_size = stringbuf_idx + len + 127;
+ 		dbg2_error_msg("grow stringbuf to %u", stringbuf_size);
+ 		stringbuf = xrealloc(stringbuf, stringbuf_size);
+ 	}
+ 	memcpy(stringbuf + stringbuf_idx, s, len);
+ 	stringbuf_idx += len;
+ }
  static void appendc(char c)
  {
- 	if (stringbuf_idx < sizeof(stringbuf))
+ 	/* We appendc() only after append(), + 15 trick in append()
- 		stringbuf[stringbuf_idx++] = c;
+ 	 * makes it unnecessary to check for overflow here */
+ 	stringbuf[stringbuf_idx++] = c;
  }
  static void bksp(void)
-Line 76 
 static void bksp(void)
+Line 91 
 static void bksp(void)
  		stringbuf_idx--;
  }
- static void append(const char *s)
- {
- 	size_t len = strlen(s);
- 	if (stringbuf_idx + len < sizeof(stringbuf)) {
- 		memcpy(stringbuf + stringbuf_idx, s, len);
- 		stringbuf_idx += len;
- 	}
- }
  static void reset_stringbuf(void)
  {
  	stringbuf_idx = 0;
-Line 92 
 static void reset_stringbuf(void)
+Line 98 
 static void reset_stringbuf(void)
  static char* copy_stringbuf(void)
  {
- 	char *copy = xmalloc(stringbuf_idx);
+ 	char *copy = xzalloc(stringbuf_idx + 1); /* terminating NUL */
  	return memcpy(copy, stringbuf, stringbuf_idx);
  }
-Line 216 
 static void parse_module(module_info *in
+Line 222 
 static void parse_module(module_info *in
  		pos = (ptr - module_image);
  	}
  	bksp(); /* remove last ' ' */
- 	appendc('\0');
  	info->aliases = copy_stringbuf();
+ 	replace(info->aliases, '-', '_');
  	/* "dependency1 depandency2" */
  	reset_stringbuf();
-Line 228 
 static void parse_module(module_info *in
+Line 234 
 static void parse_module(module_info *in
  		dbg2_error_msg("dep:'%s'", ptr);
  		append(ptr);
  	}
- 	appendc('\0');
  	info->deps = copy_stringbuf();
  	free(module_image);
-Line 314 
 static int load_dep_bb(void)
+Line 319 
 static int load_dep_bb(void)
  	while ((line = xmalloc_fgetline(fp)) != NULL) {
  		char* space;
+ 		char* linebuf;
  		int cur;
  		if (!line[0]) {
-Line 328 
 static int load_dep_bb(void)
+Line 334 
 static int load_dep_bb(void)
  		if (*space)
  			*space++ = '\0';
  		modinfo[cur].aliases = space;
- 		modinfo[cur].deps = xmalloc_fgetline(fp) ? : xzalloc(1);
+ 		linebuf = xmalloc_fgetline(fp);
+ 		modinfo[cur].deps = linebuf ? linebuf : xzalloc(1);
  		if (modinfo[cur].deps[0]) {
  			/* deps are not "", so next line must be empty */
  			line = xmalloc_fgetline(fp);
-Line 377 
 static void write_out_dep_bb(int fd)
+Line 384 
 static void write_out_dep_bb(int fd)
  	FILE *fp;
  	/* We want good error reporting. fdprintf is not good enough. */
- 	fp = fdopen(fd, "w");
+ 	fp = xfdopen_for_write(fd);
- 	if (!fp) {
- 		close(fd);
- 		goto err;
- 	}
  	i = 0;
  	while (modinfo[i].pathname) {
  		fprintf(fp, "%s%s%s\n" "%s%s\n",
-Line 566 
 static void process_module(char *name, c
+Line 569 
 static void process_module(char *name, c
  		info = find_alias(name);
  	}
+ // Problem here: there can be more than one module
+ // for the given alias. For example,
+ // "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches
+ // ata_piix because it has an alias "pci:v00008086d00007010sv*sd*bc*sc*i*"
+ // and ata_generic, it has an alias "alias=pci:v*d*sv*sd*bc01sc01i*"
+ // Standard modprobe would load them both.
+ // In this code, find_alias() returns only the first matching module.
  	/* rmmod? unload it by name */
  	if (is_rmmod) {
  		if (delete_module(name, O_NONBLOCK | O_EXCL) != 0
-Line 656 
 depmod -[aA] [-n -e -v -q -V -r -u]
+Line 667 
 depmod -[aA] [-n -e -v -q -V -r -u]
        [-b basedirectory] [forced_version]
  depmod [-n -e -v -q -r -u] [-F kernelsyms] module1.ko module2.ko ...
  If no arguments (except options) are given, "depmod -a" is assumed.
- depmod will output a dependancy list suitable for the modprobe utility.
+ depmod will output a dependency list suitable for the modprobe utility.
  Options:
      -a, --all           Probe all modules
      -A, --quick         Only does the work if there's a new module
-Line 679 
 int modprobe_main(int argc UNUSED_PARAM,
+Line 690 
 int modprobe_main(int argc UNUSED_PARAM,
  {
  	struct utsname uts;
  	char applet0 = applet_name[0];
- 	USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;)
+ 	IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;)
  	/* are we lsmod? -> just dump /proc/modules */
  	if ('l' == applet0) {
-Line 773 
 int modprobe_main(int argc UNUSED_PARAM,
+Line 784 
 int modprobe_main(int argc UNUSED_PARAM,
  		len = MAXINT(ssize_t);
  		map = xmalloc_xopen_read_close(*argv, &len);
  		if (init_module(map, len,
- 			USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
+ 			IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
- 			SKIP_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
+ 			IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
  				) != 0)
- 			bb_error_msg_and_die("cannot insert '%s': %s",
+ 			bb_error_msg_and_die("can't insert '%s': %s",
  					*argv, moderror(errno));
  		return 0;
  	}
-Line 791 
 int modprobe_main(int argc UNUSED_PARAM,
+Line 802 
 int modprobe_main(int argc UNUSED_PARAM,
  	} while (*argv);
  	if (ENABLE_FEATURE_CLEAN_UP) {
- 		USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);)
+ 		IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);)
  	}
  	return EXIT_SUCCESS;
  }

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984