emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,412 Commits 1 Branch 0 Tags 33 MiB
34e0bb3931
Commit Graph

17412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Denys Vlasenko
91755cb16d udhcp: rename server_config to server_data 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-30 16:23:34 +02:00
Jack O'Sullivan
726cbb1be8 losetup: Add partition scanning option 
Add -P option from util-linux losetup to scan for partitions.

function                                             old     new   delta
losetup_main                                         449     482     +33
packed_usage                                       33264   33292     +28
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 61/0)               Total: 61 bytes

Signed-off-by: Jack O'Sullivan <jackos1998@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-30 16:22:52 +02:00
Denys Vlasenko
bcb1fc3e6c udhcp: rename client_config to client_data, server_config to server_data 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 15:03:05 +02:00
Martin Lewis
818d9e02f2 udhcpc6: Fixed aliasing compilation error 
Signed-off-by: Martin Lewis <martin.lewis.x84@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 14:24:32 +02:00
Denys Vlasenko
8b35f207bb shell: move all definitions of strto_arith_t() together 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 14:02:10 +02:00
Denys Vlasenko
9501bc7da5 ls: fix SEGV when --color is used and ENABLE_LS_COLOR=n 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 13:53:41 +02:00
Denys Vlasenko
b2c123d484 testsuite: fix bunzip2.tests expectations 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 13:51:41 +02:00
Denys Vlasenko
eda83c9e69 comment fix 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 13:46:49 +02:00
Denys Vlasenko
cc71f79c1e libarchive: treat one "FIXME: avoid seek", take 2 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 13:43:06 +02:00
Denys Vlasenko
a4ed2c45b9 dhcp: get rid of last global data 
function                                             old     new   delta
udhcpc_main                                         2680    2684      +4
state                                                  1       -      -1
listen_mode                                            1       -      -1
sockfd                                                 4       -      -4
------------------------------------------------------------------------------
(add/remove: 0/3 grow/shrink: 1/0 up/down: 4/-6)               Total: -2 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-26 13:05:04 +02:00
Denys Vlasenko
dff2bd733f libarchive: treat one "FIXME: avoid seek" 
function                                             old     new   delta
xmalloc_read_with_initial_buf                          -     205    +205
setup_transformer_on_fd                              154     150      -4
xmalloc_open_zipped_read_close                       143     135      -8
xmalloc_read                                         201      10    -191
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/3 up/down: 205/-203)            Total: 2 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-24 17:03:28 +02:00
Denys Vlasenko
309f5e3775 losetup: implement -c 
function                                             old     new   delta
losetup_main                                         422     449     +27
packed_usage                                       33243   33264     +21
get_next_block                                      1677    1681      +4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 52/0)               Total: 52 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-23 16:11:42 +02:00
Denys Vlasenko
1115e40c88 dhcp: tweak comments, no code changes 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-23 15:24:03 +02:00
Denys Vlasenko
58d998d2f9 bunzip2: the correct condition is "n < groupCount", not "n <= groupCount". Closes 11896 
function                                             old     new   delta
get_next_block                                      1677    1681      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-23 14:54:13 +02:00
Denys Vlasenko
028c5aa18b ip: use rtnl_send_check() on flush commands, closes 6962 
function                                             old     new   delta
rtnl_send_check                                        -     160    +160
xrtnl_wilddump_request                                64      66      +2
ipneigh_list_or_flush                                714     706      -8
rtnl_send                                             69       -     -69
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 1/1 up/down: 162/-77)            Total: 85 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-22 13:54:46 +02:00
Denys Vlasenko
84fc645605 *: 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
 952537	    485	   7296	 960318	  ea73e	busybox_old
 952527	    485	   7296	 960308	  ea734	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-21 17:29:24 +02:00
Denys Vlasenko
831844c139 udhcpd: fix printing of static leases 
function                                             old     new   delta
read_staticlease                                     299     282     -17

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-21 16:06:34 +02:00
Denys Vlasenko
d8740b265a hush: show 's' in $- 
function                                             old     new   delta
expand_one_var                                      2362    2375     +13
hush_main                                           1104    1108      +4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 17/0)               Total: 17 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-19 19:11:21 +02:00
Denys Vlasenko
76a4e8361a hush: allocate line edit buffer only for interactive shell 
function                                             old     new   delta
builtin_history                                       16      20      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-19 18:24:52 +02:00
Denys Vlasenko
9edd268bad shell: implement optional "BASE#nnnn" numeric literals 
function                                             old     new   delta
evaluate_string                                      729     851    +122

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-19 17:23:31 +02:00
Denys Vlasenko
30a4c32a4d hush: remove test for "echo ${-}" errorring out - now it works 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-19 16:35:56 +02:00
Denys Vlasenko
ef8985c688 hush: implement $-, set default PATH if it is not set on startup 
function                                             old     new   delta
expand_one_var                                      2311    2362     +51
hush_main                                           1075    1104     +29
parse_dollar                                         790     791      +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 81/0)               Total: 81 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-19 16:29:09 +02:00
Denys Vlasenko
0c36019369 hush: set default PS1/2 only if we interactive 
"env - hush SCRIPT" invocation (that is, with empty environment)
should not show PS1/2 in "set" output.

function                                             old     new   delta
hush_main                                           1070    1075      +5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-19 15:39:32 +02:00
Denys Vlasenko
08fb82c80c hush: handle LINENO the same way as RANDOM: variable is "ephemeral" 
"env - hush" invocation (that is, with empty environment)
should not show LINENO in "set" output.

function                                             old     new   delta
get_local_var_value                                  263     294     +31
hush_main                                           1105    1070     -35
handle_changed_special_names                          79      38     -41
run_pipe                                            1834    1765     -69
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/3 up/down: 31/-145)          Total: -114 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-19 15:39:32 +02:00
Khem Raj
ee9e5f92b6 networking: cc is not a register 
gcc accepts

  __asm__ ( "" : : : "%cc");

but cc is not a real register and clang does not like it.

networking/tls_pstm_montgomery_reduce.c:385:4: error: unknown register name '%cc' in asm
|                         INNERMUL;
|                         ^

The % syntax nominally goes before a register, in this case cc,
like "memory" isn't a true register it's just a way of specifying that
the condition code registers for the target are clobbered

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-17 22:56:47 +02:00
Denys Vlasenko
4ebcdf7396 hush: remove code to track PS1/2 values dynamically - it's too much work 
Assignments / exports / unsets of variables are far more frequent than
prompt printing, and if we show prompt, we are likely to be limited by
user typing speed - do not optimize for that scenario.
Just re-query $PS1 / $PS2 values when need to show the prompt.

function                                             old     new   delta
fgetc_interactive                                    236     259     +23
set_vars_and_save_old                                150     147      -3
pseudo_exec_argv                                     597     594      -3
hush_main                                           1110    1105      -5
enter_var_nest_level                                  38      32      -6
builtin_local                                         56      50      -6
run_pipe                                            1857    1834     -23
leave_var_nest_level                                 127      98     -29
handle_changed_special_names                         111      79     -32
cmdedit_update_prompt                                 57       -     -57
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/8 up/down: 23/-164)          Total: -141 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-16 15:39:19 +02:00
Denys Vlasenko
a51eec0b5a typo fix in comment 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-16 14:31:58 +02:00
Denys Vlasenko
0ee0b658b3 hush: small speedup in handle_changed_special_names() 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-16 11:32:26 +02:00
Denys Vlasenko
25393fb55e udhcpd: code shrink 
function                                             old     new   delta
send_packet_verbose                                    -      35     +35
send_offer                                           443     423     -20
send_ACK                                             152     131     -21
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 35/-41)             Total: -6 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-16 11:27:28 +02:00
Denys Vlasenko
a840884531 udhcpd: support per-client hostnames in static leases 
function                                             old     new   delta
read_staticlease                                     222     299     +77
add_server_options                                    92     154     +62
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 139/0)             Total: 139 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-16 11:18:49 +02:00
Denys Vlasenko
9bf6780c28 shell: add TODO comment about BASE#nnn literals 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-16 09:56:45 +02:00
Denys Vlasenko
1113961dde dc: make 4 % 0 emit error messgaes and set result to 0 
function                                             old     new   delta
mod                                                  105     136     +31

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-16 09:40:36 +02:00
Denys Vlasenko
abe248b208 udhcpc6: unbreak 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-15 14:20:32 +02:00
Denys Vlasenko
9e0adb9b09 hush: fix quoted "${notexist-}" expansion to not disappear 
function                                             old     new   delta
expand_one_var                                      2296    2311     +15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-15 13:39:19 +02:00
Denys Vlasenko
8402969d48 udhcpd: code shrink - do not fetch requested IP twice 
function                                             old     new   delta
send_offer                                           444     443      -1
udhcpd_main                                         1454    1442     -12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-13)             Total: -13 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-15 13:08:48 +02:00
Denys Vlasenko
63d765e666 shells: add tests for backslashes in export VAR=VAL 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-14 19:15:20 +02:00
Denys Vlasenko
d8bd7012a3 hush: fix "export PS1=xyz" and "local PS1=xyz" messing up prompt 
function                                             old     new   delta
helper_export_local                                  215     253     +38
leave_var_nest_level                                 107     127     +20
run_pipe                                            1840    1857     +17
handle_changed_special_names                         101     105      +4
shell_builtin_read                                  1399    1398      -1
done_word                                            767     766      -1
parse_stream                                        2249    2245      -4
set_local_var                                        437     430      -7
is_well_formed_var_name                               66       -     -66
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 4/4 up/down: 79/-79)              Total: 0 bytes
   text	   data	    bss	    dec	    hex	filename
 952376	    485	   7296	 960157	  ea69d	busybox_old
 952400	    485	   7296	 960181	  ea6b5	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-14 18:56:04 +02:00
Denys Vlasenko
875ce094cf dd: fix handling of short result of full_write(), closes 11711 
$ dd bs=1G <sda1 of=/dev/sda1
dd: error writing '/dev/sda1': No space left on device
1+0 records in
0+0 records out
999292928 bytes (953.0MB) copied, 0.784617 seconds, 1.2GB/s

function                                             old     new   delta
write_and_stats                                       99     102      +3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-14 17:49:14 +02:00
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
0545bfa841 sed: fix /regex/,+N match triggering only once, closes 11871 
function                                             old     new   delta
process_files                                       2235    2246     +11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-13 16:30:39 +02:00
Denys Vlasenko
15021f393d udhcpd: code shrink 
function                                             old     new   delta
is_nip_reserved_as_static                              -      28     +28
get_static_nip_by_mac                                 43      47      +4
udhcpd_main                                         1459    1454      -5
send_offer                                           449     444      -5
read_leases                                          309     299     -10
is_nip_reserved                                       20       -     -20
packed_usage                                       33283   33243     -40
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 1/4 up/down: 32/-80)            Total: -48 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-10 15:55:12 +02:00
John L. Hammond
94f607a904 ln: correct 'ln -T' usage message 
Signed-off-by: John L. Hammond <jhammond@indeed.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-09 16:29:29 +02:00
Denys Vlasenko
89023b167f dc: code shrink 
function                                             old     new   delta
check_under                                           20      21      +1
print_no_pop                                          32      27      -5
pop                                                   24      18      -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 1/-11)             Total: -10 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-09 15:58:46 +02:00
Denys Vlasenko
3106784e65 ps: ensure fields are separated by at least one space, closes 11826 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-03 09:49:56 +02:00
Denys Vlasenko
b052dbea54 login: remove extra IF(), no code changes 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-05-02 17:13:20 +02:00
James Byrne
253c4e787a Optionally re-introduce bb_info_msg() 
Between Busybox 1.24.2 and 1.25.0 the bb_info_msg() function was
eliminated and calls to it changed to be bb_error_msg(). The downside of
this is that daemons now log all messages to syslog at the LOG_ERR level
which makes it hard to filter errors from informational messages.

This change optionally re-introduces bb_info_msg(), controlled by a new
option FEATURE_SYSLOG_INFO, restores all the calls to bb_info_msg() that
were removed (only in applets that set logmode to LOGMODE_SYSLOG or
LOGMODE_BOTH), and also changes informational messages in ifplugd and
ntpd.

The code size change of this is as follows (using 'defconfig' on x86_64
with gcc 7.3.0-27ubuntu1~18.04)

function                                             old     new   delta
bb_info_msg                                            -     182    +182
bb_vinfo_msg                                           -      27     +27
static.log7                                          194     198      +4
log8                                                 190     191      +1
log5                                                 190     191      +1
crondlog                                              45       -     -45
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 3/0 up/down: 215/-45)           Total: 170 bytes

If you don't care about everything being logged at LOG_ERR level
then when FEATURE_SYSLOG_INFO is disabled Busybox actually gets smaller:

function                                             old     new   delta
static.log7                                          194     200      +6
log8                                                 190     193      +3
log5                                                 190     193      +3
syslog_level                                           1       -      -1
bb_verror_msg                                        583     581      -2
crondlog                                              45       -     -45
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 3/1 up/down: 12/-48)            Total: -36 bytes

Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-04-30 10:51:27 +02:00
Denys Vlasenko
f3a064f495 libbbb: find_mount_point() too eager to stat mounted devices 
None of the below "devices" (first word on the line) are real.

sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
devtmpfs /dev devtmpfs rw,nosuid,size=7917900k,nr_inodes=1979475,mode=755 0 0
tmpfs /dev/shm tmpfs rw,nosuid,nodev 0 0
devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
tmpfs /run tmpfs rw,nosuid,nodev,mode=755 0 0
pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0
configfs /sys/kernel/config configfs rw,relatime 0 0
tmpfs /tmp tmpfs rw,relatime 0 0

function                                             old     new   delta
find_mount_point                                     297     302      +5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-04-29 17:59:08 +02:00
Denys Vlasenko
fa8878bf1f start-stop-daemon: do try to close fds > 2 
sh -c 'exec 3>&1; exec start-stop-daemon -S -b -x /bin/sleep -- 123'

now closes fd 3.

function                                             old     new   delta
bb_daemonize_or_rexec                                183     192      +9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 9/0)                 Total: 9 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-04-29 14:24:07 +02:00
Denys Vlasenko
13f4204561 ip: fix comment placement 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-04-29 00:34:07 +02:00
Denys Vlasenko
405095d84b ifupdown: close memory leak 
function                                             old     new   delta
execute_all                                           80      91     +11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2019-04-28 17:55:27 +02:00