oweals/busybox.git
6 years agowget: attempt to negotiate encrypted data ftps stream ("PROT P")
Denys Vlasenko [Tue, 6 Feb 2018 19:49:27 +0000 (20:49 +0100)]
wget: attempt to negotiate encrypted data ftps stream ("PROT P")

function                                             old     new   delta
wget_main                                           2382    2422     +40

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agofix compile failure in previous commit
Denys Vlasenko [Tue, 6 Feb 2018 17:01:39 +0000 (18:01 +0100)]
fix compile failure in previous commit

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agounzip: do not set directory mode to 0777
Denys Vlasenko [Tue, 6 Feb 2018 16:59:32 +0000 (17:59 +0100)]
unzip: do not set directory mode to 0777

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882177

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoar: hopefully fix out-of-bounds read in get_header_ar()
Denys Vlasenko [Tue, 6 Feb 2018 16:39:45 +0000 (17:39 +0100)]
ar: hopefully fix out-of-bounds read in get_header_ar()

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882175

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agofix a thinko in parse_pasv_epsv.c
Denys Vlasenko [Tue, 6 Feb 2018 16:11:15 +0000 (17:11 +0100)]
fix a thinko in parse_pasv_epsv.c

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agowget: add EPSV support
Denys Vlasenko [Tue, 6 Feb 2018 14:48:12 +0000 (15:48 +0100)]
wget: add EPSV support

function                                             old     new   delta
parse_pasv_epsv                                        -     151    +151
wget_main                                           2440    2382     -58
xconnect_ftpdata                                     223      94    -129
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 0/2 up/down: 151/-187)          Total: -36 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agowget: initial support for ftps://
Denys Vlasenko [Tue, 6 Feb 2018 14:15:08 +0000 (15:15 +0100)]
wget: initial support for ftps://

function                                             old     new   delta
spawn_ssl_client                                       -     185    +185
parse_url                                            409     461     +52
packed_usage                                       32259   32278     +19
tls_run_copy_loop                                    293     306     +13
ssl_client_main                                      128     138     +10
showmode                                             330     338      +8
P_FTPS                                                 -       5      +5
filter_datapoints                                    177     179      +2
deflate                                              907     905      -2
decode_one_format                                    723     716      -7
wget_main                                           2591    2440    -151
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 6/3 up/down: 294/-160)          Total: 134 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agowget: preparations for ftps:// support (block move, no code changes)
Denys Vlasenko [Tue, 6 Feb 2018 14:02:16 +0000 (15:02 +0100)]
wget: preparations for ftps:// support (block move, no code changes)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agotls: fix hash calculations if client cert is requested and sent
Denys Vlasenko [Tue, 6 Feb 2018 12:33:00 +0000 (13:33 +0100)]
tls: fix hash calculations if client cert is requested and sent

Symptoms: connecting to
    openssl s_server -cert vsftpd.pem -port 990 -debug -cipher AES128-SHA
works, but with "-verify 1" option added it does not.

function                                             old     new   delta
tls_xread_record                                     474     499     +25
tls_handshake                                       1582    1607     +25
bad_record_die                                        98     110     +12
tls_run_copy_loop                                    282     293     +11
tls_xread_handshake_block                             58      51      -7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/1 up/down: 73/-7)              Total: 66 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoftpd: handle restarts past 2147483647 bytes. closes 10741
Denys Vlasenko [Mon, 5 Feb 2018 18:06:40 +0000 (19:06 +0100)]
ftpd: handle restarts past 2147483647 bytes. closes 10741

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: work around bad compiler optimization
Denys Vlasenko [Sun, 4 Feb 2018 23:34:08 +0000 (00:34 +0100)]
bzip2: work around bad compiler optimization

gc-6.1.1 x86_64:
function                                             old     new   delta
generateMTFValues                                    380     367     -13

gcc-4.3.1 386:
function                                             old     new   delta
inner_loop                                             -      41     +41
generateMTFValues                                    357     294     -63
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/1 up/down: 41/-63)            Total: -22 bytes

gcc-6.3.0 386:
function                                             old     new   delta
inner_loop                                             -      36     +36
generateMTFValues                                    363     250    -113
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/1 up/down: 36/-113)           Total: -77 bytes

The last case, gcc-6.3.0, runs almost 3 times faster after this change.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoftpd: fix aliasing warning from gcc-6.1.1
Denys Vlasenko [Sun, 4 Feb 2018 22:55:14 +0000 (23:55 +0100)]
ftpd: fix aliasing warning from gcc-6.1.1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoftpgetput: add EPSV support (PASV-like thing for IPv6)
Denys Vlasenko [Sun, 4 Feb 2018 18:08:34 +0000 (19:08 +0100)]
ftpgetput: add EPSV support (PASV-like thing for IPv6)

Based on a patch by Kev Kitchens.

function                                             old     new   delta
xconnect_ftpdata                                     149     223     +74

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoftpgetput: preparations for ESPV support, no code changes
Denys Vlasenko [Sun, 4 Feb 2018 17:49:31 +0000 (18:49 +0100)]
ftpgetput: preparations for ESPV support, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoftpd: switch to mallced "globals"
Denys Vlasenko [Sun, 4 Feb 2018 17:32:21 +0000 (18:32 +0100)]
ftpd: switch to mallced "globals"

function                                             old     new   delta
cmdio_write_ok                                        45      49      +4
cmdio_write_error                                     45      49      +4
handle_dir_common                                    360     363      +3
handle_cwd                                            40      43      +3
port_or_pasv_was_seen                                 37      39      +2
pasv_active                                           13      15      +2
cmdio_write_raw                                       34      36      +2
cmdio_write                                           78      80      +2
get_remote_transfer_fd                                94      93      -1
port_pasv_cleanup                                     50      45      -5
bind_for_passive_mode                                124     119      -5
cmdio_get_cmd_and_arg                                237     230      -7
timeout_handler                                      104      93     -11
ftpd_main                                           2222    2152     -70
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 8/6 up/down: 22/-99)            Total: -77 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogunzip: fix from gzip-1.3.12 for gzip file with all zero length codes
Denys Vlasenko [Sat, 3 Feb 2018 23:15:29 +0000 (00:15 +0100)]
gunzip: fix from gzip-1.3.12 for gzip file with all zero length codes

Corresponding changelog from gzip-1.3.12 reads:

"""
2006-12-20  Paul Eggert  <eggert@cs.ucla.edu>
        * inflate.c (huft_build): Fix regression that caused gzip to
        refuse to uncompress null input (all zero length codes).  Problem
        reported by Yiorgos Adamopoulos.  This regression was caused by
        the security patch installed 2006-11-20, which in turn came from
        Debian, which in turn apparently came from Thomas Biege of SuSe.
"""

function                                             old     new   delta
huft_build                                          1176    1216     +40

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: move runningOrder[] back to stack - 256 bytes is not much
Denys Vlasenko [Sat, 3 Feb 2018 21:52:11 +0000 (22:52 +0100)]
bzip2: move runningOrder[] back to stack - 256 bytes is not much

function                                             old     new   delta
mainSort                                            1119    1108     -11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: move ->origPtr out of struct EState, make a few members smaller
Denys Vlasenko [Sat, 3 Feb 2018 19:50:20 +0000 (20:50 +0100)]
bzip2: move ->origPtr out of struct EState, make a few members smaller

function                                             old     new   delta
BZ2_compressBlock                                    223     228      +5
BZ2_blockSort                                         85      88      +3
generateMTFValues                                    356     357      +1
handle_compress                                      355     349      -6
compressStream                                       538     531      -7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/2 up/down: 9/-13)              Total: -4 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: pass sorting params through EState* pointer
Denys Vlasenko [Sat, 3 Feb 2018 19:19:51 +0000 (20:19 +0100)]
bzip2: pass sorting params through EState* pointer

function                                             old     new   delta
mainGtU                                              499     515     +16
sendMTFValues                                       2085    2094      +9
mainSort                                            1116    1119      +3
generateMTFValues                                    357     356      -1
fallbackSort                                        1719    1705     -14
mainQSort3                                          1163    1141     -22
BZ2_blockSort                                        118      85     -33
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/4 up/down: 28/-70)            Total: -42 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip2: small simplification in mainSimpleSort()
Denys Vlasenko [Sat, 3 Feb 2018 18:11:00 +0000 (19:11 +0100)]
gzip2: small simplification in mainSimpleSort()

function                                             old     new   delta
mainQSort3                                          1165    1163      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: a few more locals converted to generic types
Denys Vlasenko [Sat, 3 Feb 2018 17:47:34 +0000 (18:47 +0100)]
bzip2: a few more locals converted to generic types

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: eliminate one parameter to mainQSort3()
Denys Vlasenko [Sat, 3 Feb 2018 17:28:10 +0000 (18:28 +0100)]
bzip2: eliminate one parameter to mainQSort3()

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: small simplification in mainSort()
Denys Vlasenko [Sat, 3 Feb 2018 17:11:08 +0000 (18:11 +0100)]
bzip2: small simplification in mainSort()

function                                             old     new   delta
mainSort                                            1127    1118      -9

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: convert some locals to unsigned's
Denys Vlasenko [Sat, 3 Feb 2018 17:03:33 +0000 (18:03 +0100)]
bzip2: convert some locals to unsigned's

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: runningOrder[] values are always 0..255, make it uint8
Denys Vlasenko [Sat, 3 Feb 2018 16:44:00 +0000 (17:44 +0100)]
bzip2: runningOrder[] values are always 0..255, make it uint8

function                                             old     new   delta
mainSort                                            1171    1124     -47

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: remove redundant clearing of an alredy unset bit
Denys Vlasenko [Sat, 3 Feb 2018 16:38:23 +0000 (17:38 +0100)]
bzip2: remove redundant clearing of an alredy unset bit

function                                             old     new   delta
mainSort                                            1178    1171      -7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: eliminate write-only local numQSorted
Denys Vlasenko [Sat, 3 Feb 2018 16:30:16 +0000 (17:30 +0100)]
bzip2: eliminate write-only local numQSorted

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: make locals in mainSort() saner, convert one of them from uint16 to unsigned
Denys Vlasenko [Sat, 3 Feb 2018 16:22:06 +0000 (17:22 +0100)]
bzip2: make locals in mainSort() saner, convert one of them from uint16 to unsigned

function                                             old     new   delta
mainSort                                            1192    1178     -14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: remove redundant loop termination check in mainSort()
Denys Vlasenko [Sat, 3 Feb 2018 15:43:33 +0000 (16:43 +0100)]
bzip2: remove redundant loop termination check in mainSort()

function                                             old     new   delta
mainSort                                            1202    1192     -10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: reduce indentation, no code changes
Denys Vlasenko [Sat, 3 Feb 2018 14:59:46 +0000 (15:59 +0100)]
bzip2: reduce indentation, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: reuse zPend processing code
Denys Vlasenko [Sat, 3 Feb 2018 14:53:17 +0000 (15:53 +0100)]
bzip2: reuse zPend processing code

function                                             old     new   delta
generateMTFValues                                    378     357     -21

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: shrink makeMaps_e()
Denys Vlasenko [Sat, 3 Feb 2018 14:31:54 +0000 (15:31 +0100)]
bzip2: shrink makeMaps_e()

function                                             old     new   delta
generateMTFValues                                    378     368     -10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: optimize zPend variable code
Denys Vlasenko [Sat, 3 Feb 2018 14:26:00 +0000 (15:26 +0100)]
bzip2: optimize zPend variable code

function                                             old     new   delta
generateMTFValues                                    433     378     -55

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: have two separate "store bit 0" and "store bit 1" functions
Denys Vlasenko [Sat, 3 Feb 2018 13:56:43 +0000 (14:56 +0100)]
bzip2: have two separate "store bit 0" and "store bit 1" functions

function                                             old     new   delta
sendMTFValues                                       2051    2085     +34
bsW1_0                                                 -      33     +33
BZ2_compressBlock                                    225     223      -2
bsW1                                                  52       -     -52
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 1/1 up/down: 67/-54)             Total: 13 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: ~1% speedup by special-casing "store 1 bit" function
Denys Vlasenko [Sat, 3 Feb 2018 03:43:46 +0000 (04:43 +0100)]
bzip2: ~1% speedup by special-casing "store 1 bit" function

function                                             old     new   delta
bsW1                                                   -      52     +52
BZ2_compressBlock                                    230     225      -5
BZ2_blockSort                                        125     118      -7
sendMTFValues                                       2070    2051     -19
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/3 up/down: 52/-31)             Total: 21 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: rewrite bit of code which depends on integer overflow
Denys Vlasenko [Sat, 3 Feb 2018 02:34:40 +0000 (03:34 +0100)]
bzip2: rewrite bit of code which depends on integer overflow

function                                             old     new   delta
sendMTFValues                                       2093    2070     -23

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: delete write-only fave[] array
Denys Vlasenko [Sat, 3 Feb 2018 02:17:48 +0000 (03:17 +0100)]
bzip2: delete write-only fave[] array

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobgip2: fewer specifically-sized [u]int32_t's locals in sendMTFValues
Denys Vlasenko [Sat, 3 Feb 2018 02:12:14 +0000 (03:12 +0100)]
bgip2: fewer specifically-sized [u]int32_t's locals in sendMTFValues

Generic ints/unsigneds are usually fine. Yes, really.

function                                             old     new   delta
sendMTFValues                                       2100    2093      -7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: code shrink
Denys Vlasenko [Sat, 3 Feb 2018 01:03:42 +0000 (02:03 +0100)]
bzip2: code shrink

function                                             old     new   delta
sendMTFValues                                       2111    2100     -11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: code shrink
Denys Vlasenko [Sat, 3 Feb 2018 00:30:12 +0000 (01:30 +0100)]
bzip2: code shrink

function                                             old     new   delta
BZ2_compressBlock                                    225     230      +5
handle_compress                                      356     355      -1
bsW16                                                 59      56      -3
bsW                                                   64      61      -3
bsFinishWrite                                         37      32      -5
prepare_new_block                                     48      34     -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/5 up/down: 5/-26)             Total: -21 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: code shrink
Denys Vlasenko [Fri, 2 Feb 2018 19:59:28 +0000 (20:59 +0100)]
bzip2: code shrink

function                                             old     new   delta
bsW16                                                  -      59     +59
sendMTFValues                                       2116    2111      -5
bsPutU16                                              36       -     -36
bsPutU32                                              76      31     -45
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/2 up/down: 59/-86)            Total: -27 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agocksum: code shrink
Denys Vlasenko [Thu, 1 Feb 2018 10:44:52 +0000 (11:44 +0100)]
cksum: code shrink

function                                             old     new   delta
cksum_main                                           281     262     -19

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agolibbb: commonalize a bit of little-endian CRC32 table generation code
Denys Vlasenko [Thu, 1 Feb 2018 09:56:19 +0000 (10:56 +0100)]
libbb: commonalize a bit of little-endian CRC32 table generation code

function                                             old     new   delta
global_crc32_new_table_le                              -      11     +11
crc32_new_table_le                                     -       9      +9
inflate_unzip_internal                               560     556      -4
flash_eraseall_main                                  823     819      -4
unpack_xz_stream                                    2403    2394      -9
lzop_main                                            121     112      -9
gzip_main                                            187     178      -9
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 0/5 up/down: 20/-35)            Total: -15 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpd: use ptr_to_globals for its lone global data (g_leases)
Denys Vlasenko [Thu, 1 Feb 2018 09:41:14 +0000 (10:41 +0100)]
udhcpd: use ptr_to_globals for its lone global data (g_leases)

function                                             old     new   delta
udhcpd_main                                         1461    1463      +2
add_lease                                            320     318      -2
g_leases                                               4       -      -4
write_leases                                         223     214      -9
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/2 up/down: 2/-15)             Total: -13 bytes
   text    data     bss     dec     hex filename
 933232     481    6856  940569   e5a19 busybox_old
 933223     481    6852  940556   e5a0c busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agocp: implement -T
Aaro Koskinen [Thu, 1 Feb 2018 08:29:05 +0000 (09:29 +0100)]
cp: implement -T

Implement "cp -T". Some Linux kernel Makefiles started using this recently,
so allow also building on systems using busybox cp.

function                                             old     new   delta
cp_main                                              360     428     +68
copy_file                                           1678    1676      -2
packed_usage                                       32290   32259     -31
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 76/-39)             Total: 35 bytes

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agolibarchive: move bbunpack constants to bb_archive.h
Denys Vlasenko [Thu, 1 Feb 2018 08:13:14 +0000 (09:13 +0100)]
libarchive: move bbunpack constants to bb_archive.h

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agolzop: code shrink
Denys Vlasenko [Thu, 1 Feb 2018 00:41:31 +0000 (01:41 +0100)]
lzop: code shrink

function                                             old     new   delta
lzo_decompress                                       526     524      -2
lzo_compress                                         473     470      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agounlzop: fix --help: it has -U instead of -k
Denys Vlasenko [Thu, 1 Feb 2018 00:03:50 +0000 (01:03 +0100)]
unlzop: fix --help: it has -U instead of -k

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agobzip2: code shrink, stop using global data variable
Denys Vlasenko [Thu, 1 Feb 2018 00:00:58 +0000 (01:00 +0100)]
bzip2: code shrink, stop using global data variable

function                                             old     new   delta
compressStream                                       523     538     +15
level                                                  1       -      -1
bzip2_main                                           110      73     -37
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/1 up/down: 15/-38)            Total: -23 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: "compressed_len" is unused, stop wasting code and time calculating it
Denys Vlasenko [Wed, 31 Jan 2018 22:26:11 +0000 (23:26 +0100)]
gzip: "compressed_len" is unused, stop wasting code and time calculating it

function                                             old     new   delta
flush_block                                          595     523     -72

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: remove unnecessary forward declarations, no code changes
Denys Vlasenko [Wed, 31 Jan 2018 17:16:34 +0000 (18:16 +0100)]
gzip: remove unnecessary forward declarations, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: flush output buffer after stored blocks only if necessary
Denys Vlasenko [Wed, 31 Jan 2018 16:37:32 +0000 (17:37 +0100)]
gzip: flush output buffer after stored blocks only if necessary

function                                             old     new   delta
flush_block                                          671     680      +9

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: flush output buffer after stored blocks, they are not 32-bit aligned
Denys Vlasenko [Wed, 31 Jan 2018 16:19:59 +0000 (17:19 +0100)]
gzip: flush output buffer after stored blocks, they are not 32-bit aligned

function                                             old     new   delta
flush_block                                          665     671      +6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: make debugging of bits_sent less ugly, no code changes
Denys Vlasenko [Wed, 31 Jan 2018 16:00:41 +0000 (17:00 +0100)]
gzip: make debugging of bits_sent less ugly, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: code shrink
Denys Vlasenko [Wed, 31 Jan 2018 15:36:17 +0000 (16:36 +0100)]
gzip: code shrink

function                                             old     new   delta
flush_block                                          668     665      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: code shrink
Denys Vlasenko [Wed, 31 Jan 2018 15:11:44 +0000 (16:11 +0100)]
gzip: code shrink

Use one memset to clear part of G1, and all of G2.

function                                             old     new   delta
pack_gzip                                            838     828     -10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: code shrink
Denys Vlasenko [Wed, 31 Jan 2018 14:42:45 +0000 (15:42 +0100)]
gzip: code shrink

function                                             old     new   delta
pack_gzip                                            861     838     -23

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: code shrink and speedup
Denys Vlasenko [Wed, 31 Jan 2018 14:32:32 +0000 (15:32 +0100)]
gzip: code shrink and speedup

function                                             old     new   delta
pack_gzip                                            908     861     -47

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: optionally faster put_32bit()
Denys Vlasenko [Tue, 30 Jan 2018 23:42:29 +0000 (00:42 +0100)]
gzip: optionally faster put_32bit()

function                                             old     new   delta
put_32bit                                             22      55     +33

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: speed up send_bits()
Denys Vlasenko [Tue, 30 Jan 2018 23:01:06 +0000 (00:01 +0100)]
gzip: speed up send_bits()

Replace one RMW op with store. This speeds up gzip of a png file by ~2%.

function                                             old     new   delta
send_bits                                             62      66      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: use "unsigned" type for bit fields and bit counts
Denys Vlasenko [Tue, 30 Jan 2018 22:53:38 +0000 (23:53 +0100)]
gzip: use "unsigned" type for bit fields and bit counts

This does not change any logic, those values should always be positive.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: use wider (32-bit, not 16) bi_buf
Denys Vlasenko [Tue, 30 Jan 2018 22:47:45 +0000 (23:47 +0100)]
gzip: use wider (32-bit, not 16) bi_buf

function                                             old     new   delta
bi_windup                                             76      74      -2
send_bits                                             70      62      -8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: code shrink
Denys Vlasenko [Tue, 30 Jan 2018 21:37:06 +0000 (22:37 +0100)]
gzip: code shrink

function                                             old     new   delta
send_bits                                             92      70     -22

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: code shrink
Denys Vlasenko [Tue, 30 Jan 2018 17:15:39 +0000 (18:15 +0100)]
gzip: code shrink

function                                             old     new   delta
fill_window_if_needed                                  -     238    +238
deflate                                              924     907     -17
pack_gzip                                            809     790     -19
fill_window                                          216       -    -216
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/2 up/down: 238/-252)          Total: -14 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: code shrink (consolidate zeroing on reinit)
Denys Vlasenko [Tue, 30 Jan 2018 16:39:57 +0000 (17:39 +0100)]
gzip: code shrink (consolidate zeroing on reinit)

function                                             old     new   delta
deflate                                                -     938    +938
pack_gzip                                           1903     923    -980

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: protect against self-modifying trap code
Denys Vlasenko [Tue, 30 Jan 2018 03:29:03 +0000 (04:29 +0100)]
hush: protect against self-modifying trap code

function                                             old     new   delta
check_and_run_traps                                  211     236     +25

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: make it possible to disable "const global ptr" optimization
Denys Vlasenko [Sun, 28 Jan 2018 19:41:23 +0000 (20:41 +0100)]
ash: make it possible to disable "const global ptr" optimization

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoshell: handle $((NUM++...) like bash does. Closes 10706
Denys Vlasenko [Sun, 28 Jan 2018 19:13:33 +0000 (20:13 +0100)]
shell: handle $((NUM++...) like bash does. Closes 10706

function                                             old     new   delta
evaluate_string                                      680     729     +49

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: add LINENO support
Denys Vlasenko [Sat, 27 Jan 2018 21:02:05 +0000 (22:02 +0100)]
ash: add LINENO support

This patch is a backport from dash of the combination of:
    [SHELL] Add preliminary LINENO support
    [VAR] Fix varinit ordering that broke fc
    [SHELL] Improve LINENO support

function                                             old     new   delta
parse_command                                       1604    1677     +73
calcsize                                             156     223     +67
copynode                                             196     258     +62
evalcommand                                         1546    1606     +60
ash_main                                            1046    1103     +57
lookupvar                                             51     106     +55
evalcase                                             269     317     +48
evaltree                                             501     547     +46
evalfor                                              156     200     +44
evalsubshell                                         156     195     +39
raise_error_syntax                                    11      29     +18
varinit_data                                         120     132     +12
evalfun                                              270     280     +10
funcline                                               -       4      +4
cmdtxt                                               569     572      +3
trapcmd                                              306     304      -2
ash_vmsg                                             153     150      -3
startlinno                                             4       -      -4
funcnest                                               4       -      -4
xxreadtoken                                          263     250     -13
readtoken1                                          2645    2602     -43
------------------------------------------------------------------------------
(add/remove: 1/2 grow/shrink: 14/4 up/down: 598/-69)          Total: 529 bytes
   text    data     bss     dec     hex filename
 932834     481    6864  940179   e5893 busybox_old
 933375     481    6856  940712   e5aa8 busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: add HUSH_BASH_SOURCE_CURDIR config option, to be on par with ash
Denys Vlasenko [Sat, 27 Jan 2018 19:46:45 +0000 (20:46 +0100)]
hush: add HUSH_BASH_SOURCE_CURDIR config option, to be on par with ash

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix dot builtin to not search current directory
Denys Vlasenko [Sat, 27 Jan 2018 18:05:59 +0000 (19:05 +0100)]
hush: fix dot builtin to not search current directory

function                                             old     new   delta
builtin_source                                       182     209     +27

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agotar: accomodate non-terminated tar.chksum fields as seen from github.com
Denys Vlasenko [Sat, 27 Jan 2018 18:04:08 +0000 (19:04 +0100)]
tar: accomodate non-terminated tar.chksum fields as seen from github.com

function                                             old     new   delta
get_header_tar                                      1783    1696     -87

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: introduce a config option to search current directory for sourced files
Denys Vlasenko [Fri, 26 Jan 2018 14:15:43 +0000 (15:15 +0100)]
ash: introduce a config option to search current directory for sourced files

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agogzip: fix debug code. Closes 10681
Denys Vlasenko [Thu, 25 Jan 2018 23:21:25 +0000 (00:21 +0100)]
gzip: fix debug code. Closes 10681

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agodd: add 'fullblock' iflag
Nicholas Clark [Thu, 25 Jan 2018 18:00:19 +0000 (19:00 +0100)]
dd: add 'fullblock' iflag

Adds a fullblock iflag for improved compatibility with GNU dd.
The new iflag can be used to ensure that dd calls retrieve the
expected amount of data when reading from pipes or unusual
filesystems.

function                                             old     new   delta
packed_usage                                       32249   32334     +85
dd_main                                             1582    1632     +50
static.iflag_words                                    12      22     +10
------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 145/0)             Total: 145 bytes

Signed-off-by: Nicholas Clark <nicholas.clark@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash testsuite: add two hush tests from last commit
Denys Vlasenko [Thu, 25 Jan 2018 13:09:06 +0000 (14:09 +0100)]
ash testsuite: add two hush tests from last commit

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix two corner cases in ${v/pattern/repl}. Closes 10686
Denys Vlasenko [Thu, 25 Jan 2018 13:07:40 +0000 (14:07 +0100)]
hush: fix two corner cases in ${v/pattern/repl}. Closes 10686

function                                             old     new   delta
expand_one_var                                      1592    1618     +26

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix handling of $_ (so far it's an ordinary variable, no special meaning)
Denys Vlasenko [Thu, 25 Jan 2018 12:20:50 +0000 (13:20 +0100)]
hush: fix handling of $_ (so far it's an ordinary variable, no special meaning)

function                                             old     new   delta
parse_dollar                                         820     779     -41

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agochrt: code shrink
Denys Vlasenko [Thu, 25 Jan 2018 08:34:23 +0000 (09:34 +0100)]
chrt: code shrink

function                                             old     new   delta
show_min_max                                          60      59      -1
policies                                              96      72     -24

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoash: add support for command_not_found_handle hook function (bashism)
William Pitcock [Wed, 24 Jan 2018 17:33:18 +0000 (18:33 +0100)]
ash: add support for command_not_found_handle hook function (bashism)

This implements support for the command_not_found_handle hook function, which is
useful for allowing package managers to suggest packages which could provide the
command.

Unlike bash, however, we ignore exit codes from the hook function and always return
the correct POSIX error code (EX_NOTFOUND).

function                                             old     new   delta
find_command                                         911     990     +79

Signed-off-by: William Pitcock <nenolod@dereferenced.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoless: fix help text conditional for -R
Denys Vlasenko [Wed, 24 Jan 2018 15:47:08 +0000 (16:47 +0100)]
less: fix help text conditional for -R

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: additional fix for ppp interface type
Denys Vlasenko [Tue, 23 Jan 2018 15:46:31 +0000 (16:46 +0100)]
udhcpc6: additional fix for ppp interface type

Invent a fictitious MAC only once

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agochrt: use correct min/max priorities
Denys Vlasenko [Tue, 23 Jan 2018 15:01:13 +0000 (16:01 +0100)]
chrt: use correct min/max priorities

function                                             old     new   delta
chrt_main                                            369     432     +63
policies                                              48      96     +48
packed_usage                                       32239   32249     +10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 121/0)             Total: 121 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agochrt: add support for SCHED_IDLE
Povilas Kanapickas [Sat, 13 Jan 2018 21:27:37 +0000 (23:27 +0200)]
chrt: add support for SCHED_IDLE

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agochrt: add support for SCHED_BATCH
Povilas Kanapickas [Sat, 13 Jan 2018 21:26:39 +0000 (23:26 +0200)]
chrt: add support for SCHED_BATCH

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agood_bloaty: fix debug code
Denys Vlasenko [Tue, 23 Jan 2018 13:49:12 +0000 (14:49 +0100)]
od_bloaty: fix debug code

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoless: optional support of -R
Denys Vlasenko [Mon, 22 Jan 2018 13:38:51 +0000 (14:38 +0100)]
less: optional support of -R

Based on patches by Lubomir Rintel <lkundrak@v3.sk>

function                                             old     new   delta
read_lines                                           653     722     +69
less_main                                           2464    2531     +67
packed_usage                                       32202   32239     +37
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 173/0)             Total: 173 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agovolume_id: add LittleFS detection
Sven-Göran Bergh [Fri, 19 Jan 2018 19:36:15 +0000 (20:36 +0100)]
volume_id: add LittleFS detection

Add support for LittleFS to blkid. Not included if FEATURE_BLKID_TYPE
is not selected (neither UUID nor label).

LittleFS is a small fail-safe filesystem designed for embedded
systems. It has strong copy-on-write guarantees and storage on disk
is always kept in a valid state. It also provides a form of dynamic
wear levelling for systems that can not fit a full flash translation
layer. (https://github.com/geky/littlefs)

ARM has introduced it in its Mbed OS 5.7, so it starts to gain focus.
(https://os.mbed.com/blog/entry/littlefs-high-integrity-embedded-fs/)

function                                             old     new   delta
volume_id_probe_lfs                                    -      62     +62
fs1                                                   20      24      +4

Signed-off-by: Sven-Göran Bergh <sgb@systemaxion.se>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: fix for ppp interface type
Denys Vlasenko [Fri, 19 Jan 2018 17:44:19 +0000 (18:44 +0100)]
udhcpc6: fix for ppp interface type

function                                             old     new   delta
d6_read_interface                                    454     600    +146

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix a case where EXIT trap may modify its code mid-flight
Denys Vlasenko [Fri, 19 Jan 2018 15:58:44 +0000 (16:58 +0100)]
hush: fix a case where EXIT trap may modify its code mid-flight

function                                             old     new   delta
hush_exit                                             93      99      +6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: fix build if !BASH_LINENO_VAR
Denys Vlasenko [Fri, 19 Jan 2018 15:00:57 +0000 (16:00 +0100)]
hush: fix build if !BASH_LINENO_VAR

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agohush: implement $LINENO bashism
Denys Vlasenko [Fri, 19 Jan 2018 14:37:04 +0000 (15:37 +0100)]
hush: implement $LINENO bashism

function                                             old     new   delta
run_pipe                                            1697    1774     +77
unset_local_var_len                                  258     301     +43
hush_main                                           1009    1051     +42
set_local_var                                        516     554     +38
parse_and_run_file                                    42      75     +33
i_getch                                               96     116     +20
.rodata                                            18858   18876     +18
done_command                                         106     122     +16
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 8/0 up/down: 287/0)             Total: 287 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc[6]: remove overzealous timeout clamping code
Denys Vlasenko [Wed, 17 Jan 2018 12:55:51 +0000 (13:55 +0100)]
udhcpc[6]: remove overzealous timeout clamping code

function                                             old     new   delta
udhcpc_main                                         2840    2826     -14
udhcpc6_main                                        2699    2670     -29

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: --help fixes
Denys Vlasenko [Tue, 16 Jan 2018 21:23:38 +0000 (22:23 +0100)]
udhcpc6: --help fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: show only short opts in --help text
Denys Vlasenko [Tue, 16 Jan 2018 21:10:12 +0000 (22:10 +0100)]
udhcpc6: show only short opts in --help text

function                                             old     new   delta
packed_usage                                       26028   25966     -62

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: fix lease time staying very small because -d was not specified
Denys Vlasenko [Tue, 16 Jan 2018 20:52:23 +0000 (21:52 +0100)]
udhcpc6: fix lease time staying very small because -d was not specified

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: code shrink
Denys Vlasenko [Tue, 16 Jan 2018 20:47:10 +0000 (21:47 +0100)]
udhcpc6: code shrink

function                                             old     new   delta
udhcpc6_main                                        2723    2727      +4
.rodata                                           128695  128561    -134

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: add support of prefix delegation
Denys Vlasenko [Tue, 16 Jan 2018 20:39:14 +0000 (21:39 +0100)]
udhcpc6: add support of prefix delegation

Based on patch by DannyAAM <danny@saru.moe>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: preparatory patch, no code changes
Denys Vlasenko [Tue, 16 Jan 2018 20:35:39 +0000 (21:35 +0100)]
udhcpc6: preparatory patch, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 years agoudhcpc6: fix ipv6prefix[_lease] envvar value in script invocation
Denys Vlasenko [Tue, 16 Jan 2018 15:00:13 +0000 (16:00 +0100)]
udhcpc6: fix ipv6prefix[_lease] envvar value in script invocation

Based on a patch by DannyAAM <danny@saru.moe>.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>