61 Commits

Author	SHA1	Message	Date
Denys Vlasenko	e32b64c4ec	Convert all modutils/* applets to "new style" applet definitions ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-11-23 07:54:52 +01:00
Mike Frysinger	3a45b87ac3	modutils: support finit_module syscall ... On some systems like Chromium OS, loading modules from non-verified filesystems is denied. Only finit_module is allowed because an open fd is passed which can be checked against a verified location. Change the module loading code to first attempt finit_module and if that fails for whatever reason, fall back to the existing logic. On x86_64, this adds ~80 bytes to modutils/modutils.o and ~68 bytes to modutils/modprobe-small.o. Signed-off-by: Mike Frysinger <vapier@chromium.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-09-15 12:16:33 +02:00
Denys Vlasenko	5c3e060604	modprobe-small: fix bogus handling of unpack errors ... "modprobe minix; echo $?" Was: modprobe: corrupted data modprobe: read error from 'kernel/fs/minix/minix.ko.xz': No such file or directory modprobe: corrupted data modprobe: read error from 'kernel/fs/minix/minix.ko.xz': No such file or directory modprobe: corrupted data modprobe: read error from 'kernel/fs/minix/minix.ko.xz' modprobe: 'kernel/fs/minix/minix.ko.xz': Success 0 Now: modprobe: corrupted data modprobe: read error from 'kernel/fs/minix/minix.ko.xz' 1 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-06-20 11:02:40 +02:00
Denys Vlasenko	015db5800c	randomconfig fixes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-06-19 18:15:33 +02:00
Denys Vlasenko	8dff01d06a	libbb: introduce and use is_prefixed_with() ... function old new delta is_prefixed_with - 18 +18 complete_username 78 77 -1 man_main 737 735 -2 fsck_device 429 427 -2 unpack_ar_archive 80 76 -4 strip_unsafe_prefix 105 101 -4 singlemount 1054 1050 -4 rtc_adjtime_is_utc 90 86 -4 resolve_mount_spec 88 84 -4 parse_one_line 1029 1025 -4 parse_conf 1460 1456 -4 may_wakeup 83 79 -4 loadkmap_main 219 215 -4 get_irqs_from_stat 103 99 -4 get_header_cpio 913 909 -4 findfs_main 79 75 -4 fbsplash_main 1230 1226 -4 load_crontab 776 771 -5 expand_vars_to_list 1151 1146 -5 date_main 881 876 -5 skip_dev_pfx 30 24 -6 make_device 2199 2193 -6 complete_cmd_dir_file 773 767 -6 run_applet_and_exit 715 708 -7 uudecode_main 321 313 -8 pwdx_main 197 189 -8 execute 568 560 -8 i2cdetect_main 1186 1176 -10 procps_scan 1242 1230 -12 procps_read_smaps 1017 1005 -12 process_module 746 734 -12 patch_main 1903 1891 -12 nfsmount 3572 3560 -12 stack_machine 126 112 -14 process_timer_stats 449 435 -14 match_fstype 111 97 -14 do_ipaddr 1344 1330 -14 open_list_and_close 359 343 -16 get_header_tar 1795 1779 -16 prepend_new_eth_table 340 323 -17 fsck_main 1811 1794 -17 find_iface_state 56 38 -18 dnsd_main 1321 1303 -18 base_device 179 158 -21 find_keyword 104 82 -22 handle_incoming_and_exit 2785 2762 -23 parse_and_put_prompt 774 746 -28 modinfo 347 317 -30 find_action 204 171 -33 update_passwd 1470 1436 -34 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/49 up/down: 18/-540) Total: -522 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-03-12 17:48:34 +01:00
Denys Vlasenko	402afe1cc6	modprobe-small: fix thinko in previous commit ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-02-13 11:53:33 +01:00
Denys Vlasenko	1fd844267c	modprobe-small: if concurrent module load did not succeed, wait ... usecase: two sd cards are being mounted in parallel at same time on dual core. example modules which are getting loaded is nls_cp437. While one module is being loaded , it makes state in /proc/modules as 'coming' and then starts doing its module init function (in our case - registering nls). meanwhile on other core, if modprobe returns that is has already been loaded, then it will continue and search for the nls list which is not yet finished from first module init. This fails resulting in not mounting sd card. function old new delta process_module 667 746 +79 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-02-12 17:05:14 +01:00
Denys Vlasenko	68c048fb23	modprobe-small: fix and simplify rmmod ... "rmmod OUT_OF_TREE_MODULE" was not working, because module is not in depmod file. In general, rmmod doesn't need scanning, it simply unloads every argv[i]. function old new delta rmmod - 63 +63 modprobe_main 449 465 +16 process_module 705 667 -38 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/1 up/down: 79/-38) Total: 41 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-02-07 20:44:46 +01:00
Denys Vlasenko	1b6715345f	modprobe-small: code shrink ... function old new delta pathname_matches_modname 80 42 -38 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-01-11 17:46:56 +01:00
Denys Vlasenko	3c75b1c34e	modprobe-small: fix recent breakage: modprobe -r was using full path ... "modprobe -r MODNAME", after it found the full module pathname, should strip dirpath before trying to remove the module. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-01-11 17:40:30 +01:00
Denys Vlasenko	78854520eb	modprobe: revert checking for /, stop doing basename() on modprobe args ... function old new delta process_module 726 719 -7 filename2modname 81 67 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-21) Total: -21 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-01-01 19:02:40 +01:00
Denys Vlasenko	fd0640e5a1	modprobe-small: fix safe_strncpy truncating last char of module name ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-05-26 15:01:13 +02:00
Denys Vlasenko	07e5555a8f	modprobe-small: (un)load all modules which match the alias, not only first one ... Closes 627 and 7034. Commonly seen case is (un)loading of an alias which matches ata_generic and a more specific ata module. For example: modprobe [-r] pci:v00008086d00007010sv00000000sd00000000bc01sc01i80 (ata_generic and pata_acpi) modprobe [-r] pci:v00001106d00000571sv00001509sd00009022bc01sc01i8a (ata_generic and pata_via) function old new delta process_module 615 728 +113 parse_module 309 395 +86 find_alias 621 653 +32 pathname_matches_modname 78 79 +1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/0 up/down: 232/0) Total: 232 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-04-21 16:59:36 +02:00
Denys Vlasenko	6116cb23cc	modprobe-small: remove redundant aliases from modules.dep.bb ... function old new delta parse_module 309 395 +86 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-04-19 16:17:27 +02:00
Denys Vlasenko	5fd3ddfb24	modprobe-small: fix help messages for aliased module-related applets ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2014-04-19 15:04:39 +02:00
Denys Vlasenko	06a98e32ae	modprobe_small: make rmmod to NOT remove dependencies. Closes 5162 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-09-25 20:37:38 +02:00
Denys Vlasenko	b2d668872c	modprobe-small: add comment about aliased commands' help text ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-02-19 16:57:08 +01:00
Felipe Contreras	428bd2d433	modprobe: accept -b even if blacklist functionality is disabled ... Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-01-31 14:55:15 +01:00
Denys Vlasenko	66426760be	*: remove "Options:" string from help texts ... function old new delta packed_usage 28706 28623 -83 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-06-05 03:58:28 +02:00
Denys Vlasenko	b9f2d9f7d9	mass removal of underscores from _BB_DIR_foo and _BB_SUID_foo ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-01-18 13:58:01 +01:00
Denys Vlasenko	094cc51e50	insmod: check for module read errors ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-01-17 14:58:27 +01:00
Denys Vlasenko	e9d12b57bf	modprobe-small: support compressed modules in insmod ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-01-09 20:57:52 +01:00
Denys Vlasenko	1a5e11c874	modutils/*: move help bits into corresponding .c files ... Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>	2010-10-16 01:56:41 +02:00
Denys Vlasenko	c15613c975	modutils/*: move applet bits into corresponding *.c files ... Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>	2010-10-15 11:29:02 +02:00
Denys Vlasenko	5b3151c201	modprobe-simple; do not error out on "rmmod module" if module is unloaded ok ... ...even if it wasn't found in /lib/modules/VER/ Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>	2010-09-25 14:37:06 +02:00
Denys Vlasenko	0ef64bdb40	*: make GNU licensing statement forms more regular ... This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-08-16 20:14:46 +02:00
Pascal Bellard	b82b34e06d	modprobe: add support for -l and -s. Remove some unsupported options ... Fixed some goofs in help text function old new delta modprobe_main 494 653 +159 packed_usage 27129 27145 +16 insmod_main 98 95 -3 Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-06-07 01:18:53 +02:00
Denys Vlasenko	651a2697f7	*: merge some common strings ... text data bss dec hexfilename 838650 8009 0 846659 ceb43busybox_old 838519 8009 0 846528 ceac0busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2010-03-23 16:25:17 +01:00
Denys Vlasenko	a7ccdeef39	libbb: added xfdopen_for_read/write ... function old new delta xfdopen_helper - 40 +40 logdir_open 1163 1184 +21 process_stdin 433 443 +10 xfdopen_for_write - 9 +9 doCommands 2465 2474 +9 patch_main 1214 1222 +8 bbunpack 457 465 +8 xfdopen_for_read - 7 +7 scan_tree 258 262 +4 xstrtoul_range_sfx 230 231 +1 sendmail_main 957 955 -2 passwd_main 1027 1023 -4 parse 969 964 -5 test_main 253 247 -6 sed_main 655 649 -6 dos2unix_main 437 429 -8 fbsplash_main 950 938 -12 handle_dir_common 371 354 -17 expand_vars_to_list 2197 2169 -28 update_passwd 1275 1246 -29 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 7/10 up/down: 117/-117) Total: 0 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-11-15 23:28:11 +01:00
Denys Vlasenko	6332151641	modprobe-small: added comment about multiple alias matches ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-10-08 22:54:41 +02:00
Denys Vlasenko	0c6914e50c	modprobe-small: make string buffer code robust; fix help text ... together with previous one-liner: function old new delta append 70 99 +29 parse_module 295 311 +16 copy_stringbuf 35 36 +1 packed_usage 26545 26540 -5 appendc 27 - -27 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 3/1 up/down: 46/-32) Total: 14 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-07 02:38:26 +02:00
Denys Vlasenko	f9c814b0ee	modprobe-small: hopefully fix bug 591 (incorrect detection of alias with '-') ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-07 02:37:19 +02:00
Denys Vlasenko	043b1e5d99	more C standard compat fixes from Dan Fandrich ... function old new delta docolon 207 204 -3 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-06 12:47:55 +02:00
Denys Vlasenko	90a9904e9e	remove some GNUisms. by Dan Fandrich (dan AT coneharvesters.com) ... function old new delta logdirs_reopen 1310 1308 -2 read_line_input 4757 4753 -4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-6) Total: -6 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-09-06 02:36:23 +02:00
Denys Vlasenko	bf2af9acb2	flash_lock, flash_unlock: new applets ... By Thierry Reding (thierry.reding AT avionic-design.de) Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2009-05-25 04:15:37 +02:00
Denis Vlasenko	5e34ff29bc	*: mass renaming of USE_XXXX to IF_XXXX ... and SKIP_XXXX to IF_NOT_XXXX - the second one was especially badly named. It was not skipping anything!	2009-04-21 11:09:40 +00:00
Denis Vlasenko	1f63229a8e	rmmod: fix bug 263 ... "modutils/rmmod can't remove modules with dash in name on 2.4 kernels" function old new delta rmmod_main 187 220 +33	2009-04-13 02:25:40 +00:00
Denis Vlasenko	1ad4db1d8e	modprobe-small: fix failure to load when no arguments are given ... modutils-24: fix bad interaction of xzalloc with xrealloc_vector; style fixes	2008-11-12 00:09:58 +00:00
Bernhard Reutner-Fischer	6c4dadefb6	- update my name. No obj-code changes ;)	2008-09-25 12:13:34 +00:00
Denis Vlasenko	7c9c1bb616	modprobe-small: trivial SEGV fix	2008-09-14 20:33:03 +00:00
Denis Vlasenko	1c781cc8ff	modprobe-small: make insmod command line compatible ... function old new delta modprobe_main 326 435 +109 moderror - 52 +52 process_module 577 530 -47	2008-09-06 14:14:01 +00:00
Denis Vlasenko	279ca69727	modprobe-small: support "blacklist" keyword in /etc/modules/<modulename>	2008-08-26 01:32:33 +00:00
Denis Vlasenko	8e80411151	modprobe-small: fix infinite looping, by Timo Teras	2008-08-06 09:41:09 +00:00
Denis Vlasenko	e9ad84dfd4	*: refactor handling of archived files. "tar f file.tar.lzma" now works too. ... function old new delta unpack_Z_stream - 1229 +1229 open_zipped - 176 +176 unpack_bz2_stream_prime - 60 +60 tar_main 642 677 +35 find_main 406 418 +12 sv_main 1222 1233 +11 decode_format_string 829 837 +8 cmp_main 641 649 +8 popstring 134 140 +6 filter_accept_list_reassign 120 125 +5 parse_and_put_prompt 800 804 +4 passwd_main 1053 1049 -4 make_new_name_gunzip 119 114 -5 rpm_main 1688 1670 -18 prepare 302 283 -19 xmalloc_open_zipped_read_close 135 61 -74 uncompress 1229 - -1229 ------------------------------------------------------------------------------ (add/remove: 3/1 grow/shrink: 8/5 up/down: 1554/-1349) Total: 205 bytes	2008-08-05 13:10:34 +00:00
Denis Vlasenko	35d8c47987	whitespace fixes, no code changed	2008-08-05 07:59:25 +00:00
Denis Vlasenko	27842288b3	libbb: make xrealloc_vector zero out the realloc'ed tail ... function old new delta xrealloc_vector_helper 51 76 +25 man_main 712 705 -7 act 250 234 -16 create_list 91 70 -21 getopt_main 695 664 -31 load_dep_bb 281 248 -33 fileAction 744 709 -35 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/6 up/down: 25/-143) Total: -118 bytes	2008-08-04 13:20:36 +00:00
Denis Vlasenko	084266ed52	fix several problems with config parser: ... a bug where it underflows the string a bug where it never frees parser_t struct make read_config() return 0 if parser is NULL, make config_close() accept and ignore NULL parser - eliminates many if() blocks reverse the sense of parser bit flags - negative flags are harder to grok. hexdump: revert the change to use config parser, it is BIGGER and also requires additional quirks in parser *: explicitly use PARSER_NORMAL instead of 0 function old new delta login_main 1575 1596 +21 config_close 18 29 +11 bbunpack 383 391 +8 qgravechar 106 109 +3 rtnl_tab_initialize 121 117 -4 expand 1697 1693 -4 man_main 717 712 -5 nameif_main 674 668 -6 hexdump_main 597 591 -6 read_config 217 209 -8 dnsd_main 1478 1470 -8 sysctl_main 203 189 -14 config_open2 44 25 -19 make_device 1177 1141 -36 config_read 597 549 -48 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/11 up/down: 43/-158) Total: -115 bytes	2008-07-26 23:08:31 +00:00
Denis Vlasenko	0f99d49ae6	*: conversion to config parser ... function old new delta config_read 540 597 +57 config_open2 41 44 +3 rtnl_rtprot_initialize 70 66 -4 rtnl_rttable_initialize 78 73 -5 rtnl_rtscope_initialize 88 83 -5 rtnl_rtrealm_initialize 48 43 -5 rtnl_rtdsfield_initialize 48 43 -5 process_module 566 560 -6 bbunpack 391 383 -8 rtnl_tab_initialize 279 121 -158 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/8 up/down: 60/-196) Total: -136 bytes	2008-07-24 23:38:04 +00:00
Denis Vlasenko	5415c856ea	libbb: [x]fopen_for_{read,write} introduced and used. ... (by Valdimir) function old new delta config_open2 - 41 +41 config_read 507 542 +35 find_pair 169 187 +18 fopen_for_write - 14 +14 fopen_for_read - 14 +14 find_main 406 418 +12 xfopen_for_write - 10 +10 xfopen_for_read - 10 +10 popstring 134 140 +6 parse_inittab 396 401 +5 next_token 923 928 +5 pack_gzip 1659 1661 +2 bb__parsespent 117 119 +2 fallbackSort 1719 1717 -2 evalvar 1376 1374 -2 qrealloc 36 33 -3 ... ... ... ... singlemount 4579 4569 -10 process_stdin 443 433 -10 patch_main 1111 1101 -10 ifupdown_main 2175 2165 -10 file_action_grep 90 80 -10 uuidcache_init 649 637 -12 hush_main 797 785 -12 read_config 230 217 -13 dpkg_main 3835 3820 -15 read_line_input 3134 3110 -24 sysctl_main 232 203 -29 config_open 40 10 -30 WARN_BAD_LINE 44 - -44 login_main 1714 1575 -139 ------------------------------------------------------------------------------ (add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes	2008-07-21 23:05:26 +00:00
Denis Vlasenko	a46dd89e94	cpio: internalize archive_xread_all_eof. add a few paranoia checks ... for corrupted cpio files. modprobe-small: remove stray include route: small code shrink function old new delta get_header_cpio 958 980 +22 archive_xread_all_eof 33 - -33 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 1/0 up/down: 22/-33) Total: -11 bytes	2008-07-12 09:20:44 +00:00