emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,585 Commits 1 Branch 0 Tags 33 MiB
94dcfd8cc0
Commit Graph

103 Commits

Author SHA1 Message Date
Denys Vlasenko
205d48e948 *: add comment about APPLET_ODDNAME format 
It confused me more than once

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2017-01-29 14:57:33 +01:00
Kang-Che Sung
61a91af63d kill: optimizations for single-applet build 
* Fix a bug with a configuration in which the shell's kill builtin
  would be mistreated as a killall command (i.e. '-q' works, and
  'kill process_name' succeeds when it shouldn't):

    CONFIG_ASH_JOB_CONTROL=y
    CONFIG_HUSH_KILL=y
    # CONFIG_KILL is not set
    CONFIG_KILLALL=y
    # CONFIG_KILLALL5 is not set

* Optimize out unneeded code when the relevant applets are not
  selected.

* Move kbuild lines about shells' kill builtins from Kbuild.src to
  kill.c, to accompany the new HAVE_SH_KILL macro. I hope this would
  make maintanence a little bit easier.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2017-01-09 18:46:58 +01:00
Kang-Che Sung
53487a8d22 kill: need not build kill.c when ash's job control is off 
ash kill builtin depends on the job control config option.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2017-01-09 17:02:51 +01:00
Denys Vlasenko
1125d7d680 hush: kill builtin and kill %jobspec support 
Also made it and printf, type and wait builtins optional.

function                                             old     new   delta
builtin_kill                                           -     323    +323
bltins1                                              336     348     +12
builtin_type                                         114     116      +2
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/0 up/down: 337/0)             Total: 337 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2017-01-08 17:19:38 +01:00
Kang-Che Sung
a474728e82 ash: fix "kill %1" not working if CONFIG_ASH is disabled 
ix ash "kill %1" not working if CONFIG_ASH is disabled but
ash is launched by 'sh' or 'bash' name

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2017-01-08 14:27:34 +01:00
Denys Vlasenko
5467d268f0 Make killall and killall5 selecatable independent from kill 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2016-11-23 06:43:46 +01:00
Denys Vlasenko
f8f81ed7aa Convert all procps/* applets to "new style" applet definitions 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2016-11-23 06:23:44 +01:00
Denys Vlasenko
4b26f82c78 kill[all[5]]: code shrink 
function                                             old     new   delta
kill_main                                            992     947     -45

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2013-12-16 17:45:44 +01:00
Uros Vampl
3ac1e0d753 killall5: return 2 if no processes got killed 
function                                             old     new   delta
kill_main                                            943     992     +49

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2013-12-16 17:44:58 +01:00
Denys Vlasenko
14850308e9 killall5: don't do STOP/CONT dance if the signal we send is SIGSTOP or SIGCONT 
function                                             old     new   delta
kill_main                                            913     942     +29

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2012-04-03 08:16:05 +02:00
Alexey Fomenko
6a93212b54 kill: fix segfault in arguments parsing 
Signed-off-by: Alexey Fomenko <ext-alexey.fomenko@nokia.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-12-22 11:38:57 +01:00
Denys Vlasenko
66426760be *: remove "Options:" string from help texts 
function                                             old     new   delta
packed_usage                                       28706   28623     -83

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-06-05 03:58:28 +02:00
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
Pere Orga
9283d7c5c2 kill: fix infinite loop when passed PIDs are not valid numbers 
Signed-off-by: Pere Orga <gotrunks@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-03-07 17:00:25 +01:00
Denys Vlasenko
b12553faa8 ash: fix ash-signals/signal8 testcase failure 
function                                             old     new   delta
killcmd                                              109     224    +115
kill_main                                            882     910     +28
changepath                                           194     195      +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/0 up/down: 144/0)             Total: 144 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2011-02-21 03:22:20 +01:00
Denys Vlasenko
b32a543663 nandwrite: complain on malformed -s NUM 
Elsewhere: use common error message. -30 bytes net size change

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-08-29 13:29:02 +02:00
Denys Vlasenko
0ef64bdb40 *: make GNU licensing statement forms more regular 
This change retains "or later" state! No licensing _changes_ here,
only form is adjusted (article, space between "GPL" and "v2" and so on).

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-08-16 20:14:46 +02:00
Denys Vlasenko
651a2697f7 *: merge some common strings 
text   data    bss    dec    hexfilename
 838650   8009      0 846659  ceb43busybox_old
 838519   8009      0 846528  ceac0busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2010-03-23 16:25:17 +01:00
Denys Vlasenko
6331cf059c *: use "can't" instead of "cannot" 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 2009-11-13 09:08:27 +01:00
Denis Vlasenko
a0ab943492 function old new delta 
kill_main                                            706     884    +178
 2009-02-07 22:30:39 +00:00
Denis Vlasenko
b9b344aa44 kill[all[5]]: accept -s SIG too. kill_main: +29 bytes 
by Steve Bennett (steveb AT workware.net.au)
 2008-10-31 00:30:48 +00:00
Denis Vlasenko
6b06cb80be more of -Wall fixes from Cristian Ionescu-Idbohrn. 
Some are fixing real bugs.

function                                             old     new   delta
syslogd_main                                         938     958     +20
get_signum                                           136     143      +7
obj_load                                             777     782      +5
recv_from_to                                         210     214      +4
get_next_block                                      1795    1799      +4
display_topmem_process_list                         1117    1121      +4
logread_main                                         484     487      +3
buffer_fill_and_print                                 73      76      +3
kill_main                                            687     689      +2
ll_remember_index                                    240     241      +1
do_stats                                             452     453      +1
if_readconf                                          166     165      -1
display_process_list                                1192    1191      -1
run_applet_and_exit                                  507     505      -2
print_signames                                        33      31      -2
parse_one_line                                      1092    1090      -2
find_out_spec                                         57      55      -2
add_ksymoops_symbols                                 421     419      -2
ash_main                                            1407    1402      -5
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 11/8 up/down: 54/-17)            Total: 37 bytes
 2008-05-15 21:30:45 +00:00
Denis Vlasenko
468aea2d88 shells: do not frocibly enable test, echo and kill _applets_, 
just build relevant source and use xxx_main functions.
build system: add a special case when we have exactly one applet enabled
(makes "true", "false", "basename" REALLY tiny).
getopt32: do not use stdio.

function                                             old     new   delta
getopt32                                            1385    1412     +27
make_device                                         1187    1200     +13
basename_main                                        120     127      +7
tcpudpsvd_main                                      1922    1926      +4
testcmd                                                5       -      -5
echocmd                                                5       -      -5
fuser_main                                          1243    1231     -12
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 4/1 up/down: 51/-22)             Total: 29 bytes
 2008-04-01 14:47:57 +00:00
Denis Vlasenko
1fe4e9e573 cosmetic change in message text 2007-11-15 00:57:40 +00:00
Paul Fox
ae6bf96659 bad syntax error should go to stderr 2007-11-14 23:48:35 +00:00
Denis Vlasenko
9b49a5ed85 add -fvisibility=hidden to CC flags, mark XXX_main functions 
EXTERNALLY_VISIBLE. 5% size reduction of libbusybox.so
 2007-10-11 10:05:36 +00:00
Denis Vlasenko
a4f4de9b7e print_signames_and_exit -> print_signames (because of "ash calls kill_main") 2007-09-30 16:32:01 +00:00
Denis Vlasenko
72e1c89d97 pgrep,pkill: new applets by Loic Grenie <loic.grenie@gmail.com> 2007-09-29 22:26:01 +00:00
Denis Vlasenko
b6adbf1be2 usage.c: remove reference to busybox.h 
*: s/include "busybox.h"/include "libbb.h"
 2007-05-26 19:00:18 +00:00
Denis Vlasenko
0cacc80952 kill: improve comment 2007-05-06 22:51:52 +00:00
Denis Vlasenko
02f47e9f81 kill: fix recent breakage of vda, also make code smaller by 21 bytes. 2007-05-06 22:48:55 +00:00
Denis Vlasenko
dcf4de20a1 test: code size saving, no logic changes 
ps: fix warning, make a bit smaller
kill -l: make smaller & know much more signals

function                                             old     new   delta
get_signum                                           121     153     +32
kill_main                                            826     843     +17
get_signame                                           44      36      -8
signals                                              252     224     -28
.rodata                                           131955  131923     -32
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/3 up/down: 49/-68)            Total: -19 bytes
 2007-05-01 20:07:29 +00:00
Denis Vlasenko
f20de5bb42 ash,kill: use common code for kill applet/builtin 
# make bloatcheck
function                                             old     new   delta
evaltreenr                                           644     654     +10
evaltree                                             644     654     +10
parse_conf                                          1440    1444      +4
dpkg_deb_main                                        426     429      +3
ed_main                                             3319    3321      +2
passwd_main                                         2093    2091      -2
kill_main                                            830     826      -4
singlemount                                         4609    4601      -8
find_command                                         962     954      -8
get_lcm                                              123     105     -18
.rodata                                           132243  132147     -96
killcmd                                              449     120    -329
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/7 up/down: 29/-465)          Total: -436 bytes

# size busybox_old busybox_unstripped
   text    data     bss     dec     hex filename
 723901    2940   27504  754345   b82a9 busybox_old
 723457    2940   27504  753901   b80ed busybox_unstripped
 2007-04-29 23:42:54 +00:00
Denis Vlasenko
06af216528 suppress warnings about easch <applet>_main() having 
no preceding prototype
 2007-02-03 17:28:39 +00:00
Denis Vlasenko
150f402b36 whitespace fixes (leading spaces to tab) 2007-01-13 21:06:21 +00:00
Denis Vlasenko
459e4d6cf7 replace /proc scanning code by more versatile one. 
Use it where appropriate.
Stop scanning /etc/passwd *for every process*!!! (uid->username)
top: reduce memory usage - we won't save unneeded fields
from /proc info anymore. Downside: ~+250 bytes of code
 2006-11-05 00:43:51 +00:00
Denis Vlasenko
fa07680091 top: improve CPU% calculation 
style fixes
 2006-11-05 00:38:51 +00:00
Denis Vlasenko
dd539f7687 Unneeded code removed, usused field "unsigned pscpu" removed 2006-11-01 20:20:37 +00:00
Denis Vlasenko
35fb512728 PID should be stored in pid_t, not int or long. 
find_pid_by_name() was returning 0 or -1 in last array element,
but -1 was never checked. We can use just 0 intead.
 2006-11-01 09:16:49 +00:00
Denis Vlasenko
1385899416 attempt to regularize atoi mess. 2006-10-08 12:49:22 +00:00
Denis Vlasenko
8f8f268cfd bb_applet_name -> applet_name 2006-10-03 21:00:43 +00:00
Denis Vlasenko
0bb628f4f3 kill: implement killall5. OpenWRT folks will be happy. 
However their code was unusably different from sysvinit original.
Run tested.
 2006-09-27 14:25:33 +00:00
Denis Vlasenko
a77947f5bb kill: fix bugs (kill -l output was horrible), fix style, constify data 2006-09-27 14:19:16 +00:00
Rob Landley
16bbb20089 Random cleanup hanging around my tree. 2006-09-12 20:28:34 +00:00
Rob Landley
c9c1a41c58 A couple things that got tangled up in my tree, easier to check in both than 
untangle them:

Rewrite u_signal_names() into get_signum() and get_signame(), plus trim the
signal list to that required by posix (they can specify the numbers for
the rest if they really need them).  (This is preparatory cleanup for adding
a timeout applet like Roberto Foglietta wants.)

Export the itoa (added due to Denis Vlasenko, although it's not quite his
preferred implementation) from xfuncs.c so it's actually used, and remove
several other redundant implementations of itoa and utoa() in the tree.
 2006-07-12 19:17:55 +00:00
Bernhard Reutner-Fischer
e15d7573a1 - move #include busybox.h to the very top so we pull in the config 
and eventual platform specific includes in early.
 2006-06-02 20:56:16 +00:00
Rob Landley
dfba741457 Robert P. Day removed 8 gazillion occurrences of "extern" on function 
definitions.  (That should only be on prototypes.)
 2006-03-06 20:47:33 +00:00
"Vladimir N. Oleynik"
1e98a0705b close bug 638 2006-01-25 13:21:08 +00:00
Tim Riker
c1ef7bdd8d just whitespace 2006-01-25 00:08:53 +00:00
Mike Frysinger
b92405552f Jason Schoon writes: 
Here is a patch for kill that I posted long ago, but forgot about
until today.  This allows kill to specify a negative process/group
(such as -1).  The shell already had this fix applied by Vodz some
time ago.
 2006-01-04 00:13:22 +00:00