aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Post-merge fixesRon Yorston2017-07-243-7/+10
|
* Merge branch 'busybox' into mergeRon Yorston2017-07-24426-3245/+4005
|\
| * udhcpc[6]: downgrade "adapter index N" messages to log2 levelDenys Vlasenko2017-07-242-3/+3
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * udhcpc[6]: fix messages referring to select() while we use poll()Denys Vlasenko2017-07-242-4/+4
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: add all hush parsing tests to ast testsDenys Vlasenko2017-07-2449-4/+331
| | | | | | | | | | | | All pass. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: use mempcpy where usefulDenys Vlasenko2017-07-241-7/+4
| | | | | | | | | | | | | | | | | | | | function old new delta o_addblock 58 42 -16 expand_one_var 1618 1555 -63 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-79) Total: -79 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: fix for last commitDenys Vlasenko2017-07-231-1/+1
| | | | | | | | | | | | "mempcpy(q, s, len) + len" is obviously no good :( Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: use mempcpy() in more placesDenys Vlasenko2017-07-231-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Most changes are taken from dash. function old new delta single_quote 127 129 +2 stack_nputstr 28 29 +1 path_advance 209 202 -7 rmescapes 346 308 -38 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/2 up/down: 3/-45) Total: -42 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * zcip: fix slow environment leakDenys Vlasenko2017-07-223-6/+12
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * crond: do not assume setenv() does not leakDenys Vlasenko2017-07-222-3/+21
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * libbb: avoid malloc/free in bb_unsetenv()Denys Vlasenko2017-07-221-13/+21
| | | | | | | | | | | | | | function old new delta bb_unsetenv 55 83 +28 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * crond: allow $SHELL and starting user's shell override DEFAULT_SHELL. Closes ↵Denys Vlasenko2017-07-221-2/+7
| | | | | | | | | | | | | | | | | | | | 6458 function old new delta crond_main 1134 1149 +15 fork_job 453 454 +1 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: use mempcpy() where appropriateDenys Vlasenko2017-07-211-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * basename: do not use argcDenys Vlasenko2017-07-211-5/+4
| | | | | | | | | | | | | | function old new delta basename_main 153 148 -5 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * pgrep: fix "pgrep -v -P1"; also allow matching of comm - closes 10086Denys Vlasenko2017-07-211-10/+37
| | | | | | | | | | | | | | function old new delta pgrep_main 662 720 +58 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ping: fix help text to show what parameter -p takesDenys Vlasenko2017-07-211-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: suppress readonly1.tests false positive; add readonly0.testsDenys Vlasenko2017-07-214-4/+62
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: improve set -x to quote strings as necessaryDenys Vlasenko2017-07-213-11/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basen on the patch from Martijn Dekker <martijn@inlv.org> function old new delta evalcommand 1161 1302 +141 maybe_single_quote - 60 +60 getoptscmd 527 546 +19 readtoken1 2819 2823 +4 localcmd 366 364 -2 evaltreenr 495 479 -16 evaltree 495 479 -16 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 3/3 up/down: 224/-34) Total: 190 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * udhcpc[6]: on log level 1, three messages about raw socket is overkillDenys Vlasenko2017-07-212-4/+4
| | | | | | | | | | | | | | | | | | | | Move first two messages to log2 level: 08:46:32.23824 udhcpc: opening raw socket on ifindex 2 08:46:32.23825 udhcpc: got raw socket fd 08:46:32.26354 udhcpc: created raw socket Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ping: better config help text for FEATURE_FANCY_PINGDenys Vlasenko2017-07-211-6/+5
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * config: deindent all help textsDenys Vlasenko2017-07-21353-2644/+2643
| | | | | | | | | | | | Those two spaces after tab have no effect, and always a nuisance when editing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * libarchive: FEATURE_LZMA_FAST should be visible if FEATURE_SEAMLESS_LZMADenys Vlasenko2017-07-208-26/+15
| | | | | | | | | | | | While at it, tweak some config help texts. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * unzip: sanitize filename length: malloc(1234mb) is not funnyDenys Vlasenko2017-07-201-2/+8
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * unzip: implement -j, closes 9126Denys Vlasenko2017-07-201-16/+30
| | | | | | | | | | | | | | | | | | | | function old new delta unzip_main 2642 2703 +61 packed_usage 31747 31770 +23 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/0 up/down: 84/0) Total: 84 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * unzip: robustify overwrite checksDenys Vlasenko2017-07-201-31/+53
| | | | | | | | | | | | | | | | | | | | function old new delta get_lstat_mode - 55 +55 unzip_main 2667 2642 -25 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/1 up/down: 55/-25) Total: 30 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * unzip: support symlinks. Closes 10031Denys Vlasenko2017-07-201-13/+48
| | | | | | | | | | | | | | function old new delta unzip_main 2519 2667 +148 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * bzcat,zcat: simplify code if gunzip/bunzip2 is not selectedDenys Vlasenko2017-07-201-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * shell: optional support for read -t N.NNN, closes 10101Denys Vlasenko2017-07-206-30/+93
| | | | | | | | | | | | | | | | function old new delta shell_builtin_read 1097 1277 +180 dump_procs 353 359 +6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * bootchartd: fix typo in commentDenys Vlasenko2017-07-201-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * bootchartd: prevent premature stop by device mapperUwe Geuder2017-07-201-1/+3
| | | | | | | | | | | | | | | | Kernel thread kdmflush was recognized as display manager kdm, check for string length. Signed-off-by: Uwe Geuder <busybox2017-ugeuder@snkmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * sparc: needs -fPICDenys Vlasenko2017-07-193-1/+23
| | | | | | | | | | | | Pinted out by Thomas Petazzoni. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * swapon/swapoff: trim config help textDenys Vlasenko2017-07-191-3/+0
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * Update remaining menuconfig items with approximate applet sizesDenys Vlasenko2017-07-1925-28/+28
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * od_bloaty: fix floating point outputRon Yorston2017-07-192-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently od_bloaty does this: $ /bin/echo -en '\x00\x00\x00\x00\x00\x00\x00\x00' | busybox od -f od: invalid character 'F' in type string 'fF' $ /bin/echo -en '\x00\x00\x00\x00\x00\x00\x00\x00' | busybox od -t fD od: invalid character 'D' in type string 'fD' $ /bin/echo -en '\x00\x00\x00\x00\x00\x00\x00\x00' | busybox od -t f 0000000 0000010 The first two occur because the alphabetic length specifier isn't being properly skipped. The third is due to the empty length specifier being treated as alphabetic so we fall off the end of the FDL_sizeof array with undetermined consequences. Coreutils defaults to printing a double in this case. With this patch the output is: $ /bin/echo -en '\x00\x00\x00\x00\x00\x00\x00\x00' | ./busybox od -f 0000000 0.0000000e+00 0.0000000e+00 0000010 $ /bin/echo -en '\x00\x00\x00\x00\x00\x00\x00\x00' | ./busybox od -t fD 0000000 0.000000000000000e+00 0000010 $ /bin/echo -en '\x00\x00\x00\x00\x00\x00\x00\x00' | ./busybox od -t f 0000000 0.000000000000000e+00 0000010 I guess nobody uses BusyBox od to print floating point numbers. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hdparm: remove contradicting size info in config helpDenys Vlasenko2017-07-181-2/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: remove contradicting size info in config helpDenys Vlasenko2017-07-181-2/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: remove contradicting size info in config helpDenys Vlasenko2017-07-181-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * Update menuconfig items with approximate applet sizesDenys Vlasenko2017-07-18303-379/+409
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * Tweaks from mass recompile for 1.27.1 releaseDenys Vlasenko2017-07-182-7/+53
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: tweak "help" outputDenys Vlasenko2017-07-181-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | ash: allow for filename extension in find_commandRon Yorston2017-07-241-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for a command specified as a pathname also check for the filename with a '.exe' or '.com' extension. Previously even if /bin/busybox.exe was present we got: $ command -v /bin/busybox $ echo $? 127 This now becomes: $ command -v /bin/busybox /bin/busybox $ echo $? 0
* | win32: simplify spawning appletsRon Yorston2017-07-212-30/+5
| | | | | | | | | | | | | | The original WIN32 code used the BUSYBOX_APPLET_NAME environment variable to pass the applet name to the spawned process. This was based on the (apparently) mistaken idea that WIN32 would replace argv[0] with the path to the executable.
* | Update default configurationsRon Yorston2017-07-182-28/+50
| |
* | Merge branch 'busybox' into mergeRon Yorston2017-07-18157-1220/+3033
|\|
| * printf: fix format string sanity checkRon Yorston2017-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the tests for printf checks for an invalid bare '%' in the format string: $ busybox printf '%' a b c printf: %: invalid format On x86_64 a slightly different test doesn't work correctly: $ busybox printf '%' d e f printf: invalid number 'd' printf: invalid number 'e' printf: invalid number 'f' On other platforms the test fails randomly depending on how the arguments are laid out in memory. There are two places in the code where strchr is used to determine if a character in the format string is valid. However, strchr also returns a valid pointer if the character being searched for is the null terminator thus causing the code to incorrectly suppose that a valid character has been found. Add explicit checks for the null terminator. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: fix readonly2.tests failureDenys Vlasenko2017-07-183-0/+13
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: another testcase for "READONLY_VAR=VAL BLTIN ..."Denys Vlasenko2017-07-184-5/+27
| | | | | | | | | | | | Currently fails. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: do not assign to readonly VAR in "VAR=VAL CMD" syntax tooDenys Vlasenko2017-07-183-12/+33
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: add readonly testcase, fix falloutDenys Vlasenko2017-07-183-9/+53
| | | | | | | | | | | | | | | | | | | | function old new delta helper_export_local 185 214 +29 run_pipe 1549 1560 +11 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/0 up/down: 40/0) Total: 40 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: convert exp/ro/local parameters to bitfields in one flag paramDenys Vlasenko2017-07-181-46/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta helper_export_local 174 185 +11 set_local_var 424 420 -4 run_list 1048 1044 -4 set_vars_and_save_old 88 83 -5 set_local_var_from_halves 27 22 -5 run_pipe 1554 1549 -5 builtin_export 173 168 -5 set_pwd_var 40 34 -6 builtin_readonly 70 64 -6 expand_one_var 1625 1618 -7 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/9 up/down: 11/-47) Total: -36 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>