Magellan Linux

Diff of /trunk/mkinitrd-magellan/busybox/modutils/insmod.c

Parent Directory Parent Directory | Revision Log 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 16  int insmod_main(int argc UNUSED_PARAM, c Line 16  int insmod_main(int argc UNUSED_PARAM, c
16   char *filename;   char *filename;
17   int rc;   int rc;
18    
19   USE_FEATURE_2_4_MODULES(   /* Compat note:
20     * 2.6 style insmod has no options and required filename
21     * (not module name - .ko can't be omitted).
22     * 2.4 style insmod can take module name without .o
23     * and performs module search in default directories
24     * or in $MODPATH.
25     */
26    
27     IF_FEATURE_2_4_MODULES(
28   getopt32(argv, INSMOD_OPTS INSMOD_ARGS);   getopt32(argv, INSMOD_OPTS INSMOD_ARGS);
29   argv += optind-1;   argv += optind - 1;
30   );   );
31    
32   filename = *++argv;   filename = *++argv;
# Line 27  int insmod_main(int argc UNUSED_PARAM, c Line 35  int insmod_main(int argc UNUSED_PARAM, c
35    
36   rc = bb_init_module(filename, parse_cmdline_module_options(argv));   rc = bb_init_module(filename, parse_cmdline_module_options(argv));
37   if (rc)   if (rc)
38   bb_error_msg("cannot insert '%s': %s", filename, moderror(rc));   bb_error_msg("can't insert '%s': %s", filename, moderror(rc));
39    
40   return rc;   return rc;
41  }  }

Legend:
Removed from v.983  
changed lines
  Added in v.984