340 Commits

Author	SHA1	Message	Date
Denys Vlasenko	8c317f03f6	style fix, no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2019-05-14 17:26:47 +02:00
Denys Vlasenko	b097a84d62	config: update size information ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-12-28 03:20:17 +01:00
Denys Vlasenko	4892f3a4c7	inetd,mount: add comment with example of flags to build with libtirpc ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2018-02-13 18:20:28 +01:00
Denys Vlasenko	647d8afe86	build system: remove unused CONFIG_FEATURE_HAVE_RPC ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-08-14 12:25:55 +02:00
Denys Vlasenko	22542eca18	getopt32: remove opt_complementary ... function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-08-08 21:55:02 +02:00
Denys Vlasenko	5b3cbe3a53	config: more tweaking of help texts ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-27 14:45:25 +02:00
Denys Vlasenko	8cae43c5d7	swapon: do not use FEATURE_MOUNT_LABEL, have your own FEATURE_SWAPONOFF_LABEL ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-27 10:58:08 +02:00
Denys Vlasenko	68b653b66b	config: trim/improve item names and help texts, take 2 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-27 10:53:09 +02:00
Denys Vlasenko	72089cf6b4	config: deindent all help texts ... Those two spaces after tab have no effect, and always a nuisance when editing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-21 09:50:55 +02:00
Denys Vlasenko	4eed2c6c50	Update menuconfig items with approximate applet sizes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-18 22:01:24 +02:00
Denys Vlasenko	ce55284ed6	inetd,mount: do not die if uclibc without RPC is detected ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-07-10 14:43:22 +02:00
Denys Vlasenko	ab518eea9c	mount: create loop devices with LO_FLAGS_AUTOCLEAR flag ... The "autolooped" mount (mount [-oloop] IMAGE /DIR/DIR) always creates AUTOCLEARed loopdevs, so that umounting drops them (and this does not require any code in the umount userspace). This happens since circa linux-2.6.25: commit 96c5865559cee0f9cbc5173f3c949f6ce3525581 Date: Wed Feb 6 01:36:27 2008 -0800 Subject: Allow auto-destruction of loop devices IOW: in this case, umount does not have to use -d to drop the loopdev. The explicit loop mount (mount /dev/loopN /DIR/DIR) does not do this. In this case, umount without -d should not drop loopdev. Unfortunately, bbox umount currently always implies -d, this probably needs fixing. function old new delta set_loop 537 597 +60 singlemount 1101 1138 +37 losetup_main 419 432 +13 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/0 up/down: 110/0) Total: 110 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-03-16 16:55:47 +01:00
Denys Vlasenko	35b54a3c24	libbb: match_fstype() is unreadable in the extreme, fixing it ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-01-30 00:45:05 +01:00
Denys Vlasenko	f560422fa0	Big cleanup in config help and description ... Redundant help texts (one which only repeats the description) are deleted. Descriptions and help texts are trimmed. Some config options are moved, even across menus. No config option _names_ are changed. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2017-01-10 14:58:54 +01:00
Denys Vlasenko	dd898c9f33	Convert all util-linux/* applets to "new style" applet definitions ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-11-23 11:46:32 +01:00
Denys Vlasenko	b09ab448b8	mount: for cifs, dont insert "ip=ADDR" option if user gave it explicitly ... This makes it possible to use scoped IPv6 addresses: mount -t cifs -o ip=<ADDR>%<iface_id> //<ADDR>/test test Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-09-27 21:02:35 +02:00
Denys Vlasenko	5093c8c4aa	mount: tweak "IPv6 scoped addr" commit ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-09-26 20:36:30 +02:00
Denys Vlasenko	3c18e3051d	libbb: make xmalloc_sockaddr2dotted use NI_NUMERICSCOPE ... Gives "mount -t cifs //fe80::6a05:caff:fe3e:dbf5%eth0/test test" a chance to work: mount must pass "ip=numeric_IPv6%numeric_iface_id" in the omunt option string. Currently, it does not. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-09-26 19:53:04 +02:00
Denys Vlasenko	237bedd499	getopt32: add new syntax of 'o:+' and 'o:*' for -o NUM and -o LIST ... In many cases, this aqllows to drop use of opt_complementary. Approximately -400 bytes: function old new delta getopt32 1423 1502 +79 opt_string 17 18 +1 OPT_STR 24 25 +1 uniq_main 416 406 -10 timeout_main 279 269 -10 sulogin_main 270 260 -10 readprofile_main 1825 1815 -10 ps_main 543 533 -10 pidof_main 245 235 -10 pgrep_main 611 601 -10 od_main 2600 2590 -10 mkfs_minix_main 2684 2674 -10 mkfs_ext2_main 2603 2593 -10 microcom_main 712 702 -10 makemime_main 315 305 -10 ionice_main 282 272 -10 inetd_main 2074 2064 -10 ifplugd_main 1144 1134 -10 halt_main 353 343 -10 getopt_main 636 626 -10 fdisk_main 2854 2844 -10 env_main 206 196 -10 dmesg_main 319 309 -10 conspy_main 1214 1204 -10 awk_main 981 971 -10 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/22 up/down: 81/-220) Total: -139 bytes text data bss dec hex filename 919373 906 14060 934339 e41c3 busybox_old 918969 906 14060 933935 e402f busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-07-06 21:58:02 +02:00
Denys Vlasenko	ecf25cb5bc	randomconfig fixes 5: false positive for tar; mount emits corrupted message ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-06-20 11:04:04 +02:00
Denys Vlasenko	3e134ebf6a	*: slap on a few ALIGN1/2s where appropriate ... The result of looking at "grep -F -B2 '*fill*' busybox_unstripped.map" text data bss dec hex filename 829901 4086 1904 835891 cc133 busybox_before 829665 4086 1904 835655 cc047 busybox Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-04-22 18:09:21 +02:00
Denys Vlasenko	47cfbf32fd	*: add most of the required setup_common_bufsiz() calls ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-04-21 18:18:48 +02:00
Denys Vlasenko	e6a2f4cc5a	libbb: make bb_common_bufsiz1 1 kbyte, add capability to use bss tail for it ... The config item is FEATURE_USE_BSS_TAIL. When it is off (default): function old new delta read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 push 46 44 -2 inetd_main 2136 2134 -2 uevent_main 421 418 -3 addLines 97 92 -5 bb_common_bufsiz1 8193 1024 -7169 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 8/5 up/down: 62/-7181) Total: -7119 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829901 4086 1904 835891 cc133 busybox_unstripped FEATURE_USE_BSS_TAIL=y: read_config 210 228 +18 doCommands 2279 2294 +15 ipneigh_list_or_flush 763 772 +9 ipaddr_list_or_flush 1256 1261 +5 display_process_list 1301 1306 +5 conspy_main 1378 1383 +5 do_lzo_compress 352 355 +3 do_lzo_decompress 565 567 +2 inetd_main 2136 2134 -2 bb_common_bufsiz1 8193 - -8193 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 8/1 up/down: 62/-8195) Total: -8133 bytes text data bss dec hex filename 829850 4086 9080 843016 cdd08 busybox_old 829911 4086 880 834877 cbd3d busybox_unstripped FIXME: setup_common_bufsiz() calls are missing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2016-04-21 17:39:11 +02:00
Denys Vlasenko	911d265faf	mount: support "nofail" option. Closes 8551 ... function old new delta singlemount 1045 1060 +15 mount_option_str 338 345 +7 mount_it_now 355 361 +6 mount_options 172 176 +4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/0 up/down: 32/0) Total: 32 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2015-12-30 20:11:34 +01: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
Isaac Dunham	7b434a67dc	mount: -T OTHERTAB support ... function old new delta mount_main 1221 1241 +20 packed_usage 30616 30610 -6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> Signed-off-by: Isaac Dunham <ibid.ag@gmail.com>	2015-03-11 16:07:24 +01:00
Denys Vlasenko	9b7ebfe644	mount: whitespace fix. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-22 11:00:45 +01:00
Bernhard Reutner-Fischer	20c5e5a626	mount: fix -o user=foo mishandling, fix unc= generation, add prefixpath= ... function old new delta singlemount 1019 1049 +30 packed_usage 29252 29257 +5 parse_mount_options 230 232 +2 mount_option_str 337 338 +1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/0 up/down: 38/0) Total: 38 bytes Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-17 02:30:35 +01:00
Martin Santesson	406ea15e2c	mount: add unc option to CIFS mount (needed for Linux 3.4+) ... unc option for CIFS mount is mandatory after CIFS option parsing was rewritten in Linux 3.4 Signed-off-by: Martin Santesson <martinsn@axis.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-16 00:47:19 +01:00
Denys Vlasenko	6967578728	whitespace fixes. no code changes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2013-01-14 01:34:48 +01:00
Denys Vlasenko	9ad8979ff1	mount: support strictatime option. Closes 5240 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-06-26 16:09:00 +02:00
Denys Vlasenko	6ebb2b6b24	mount: do not pass "comment=ANYTHING" option to kernel. Closes 5240 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-06-22 15:17:18 +02:00
Denys Vlasenko	a396ade9f8	mount: undo recent breakage when mount flags were made unsigned ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-06-22 15:06:27 +02:00
Denys Vlasenko	9ee4266490	mount: set up RO loop device if mount -o ro. Closes 4784 ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-06-21 12:08:56 +02:00
Denys Vlasenko	56443cdbdd	whitespace fixes ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2012-04-20 15:07:22 +02:00
Denys Vlasenko	39b233182c	mount: resolve hosts to IPs in nfs mounts ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-10 17:01:39 +01:00
Denys Vlasenko	a86e02492d	mount: make FEATURE_MOUNT_NFS not needed for Linux 2.6.23+ ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-10 16:53:35 +01:00
Dave Love	fae473c81b	mount: support -o noacl ... Signed-off-by: Dave Love <fx@gnu.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-10 15:19:25 +01:00
Karol Lewandowski	b5ebe5fdb3	mount: handle list of comma-separated fs types in -t option ... Allows one to specify list of filesystem types to be tried when mounting particular device. E.g. mount -t vfat,ext2 ... Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-03 10:02:31 +01:00
Denys Vlasenko	f85554c265	mount: free commented /etc/filesystems lines when we read it ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-11-03 09:54:53 +01:00
Denys Vlasenko	16714245f9	add INIT_G()'s. No code changes. ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-09-21 01:59:15 +02:00
Denys Vlasenko	13e709c53f	losetup: implement -r option. Closes 4033. ... function old new delta packed_usage 28595 28633 +38 losetup_main 285 290 +5 singlemount 906 908 +2 set_loop 674 672 -2 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-09-12 08:30:16 +02: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
Bernhard Reutner-Fischer	882062915d	mount: for NFS use tcp per default rather than udp ... nfs-utils's mount.nfs uses TCP per default unless explicitly asked for otherwise. This is also the expected behaviour for NFSv4, so ok there, too. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>	2011-05-04 19:03:30 +02:00
Pere Orga	5bc8c005a8	move remaining help text from include/usage.src.h ... Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-04-11 03:29:49 +02:00
Roman Borisov	19311bfa7b	mount: add --rbind option support ... Signed-off-by: Roman Borisov <ext-roman.borisov@nokia.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-03-26 23:12:12 +01:00
Roman Borisov	d3679d2491	mount: rprivate option fix ... fixed the mistake in writing for -make-rprivate option Signed-off-by: Roman Borisov <ext-roman.borisov@nokia.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-03-26 23:02:05 +01:00
Denys Vlasenko	c6450c974f	mount: strip multiple trailing slashes, not just one ... Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-02-28 11:09:49 +01:00
Roman Borisov	c8dc01dc80	mount: update /etc/mtab properly on mount --move ... Signed-off-by: Roman Borisov <ext-roman.borisov@nokia.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-02-28 05:06:01 +01:00
Peter Korsgaard	301fe50ca2	mount: ignore unknown mount options when remounting NFS mounts ... Don't fail on unknown nfs mount options. The kernel automatically adds a few mount options that we don't currently handle, like: sec=null|sys|krb5.. mountaddr=<ip> mountproto=tcp|udp local_lock=none|all|flock|posix Which causes a simple mount -o remount,rw <mountpoint> to fail. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>	2011-02-26 19:02:36 +01:00