emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: sleep builtin with no arguments should not exit

Browse Source 
function                                             old     new   delta
sleep_main                                           116     143     +27
.rodata                                           105245  105268     +23
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 50/0)               Total: 50 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2023-04-03 19:54:42 +02:00
parent 515adcc9f3
commit d661cb1977
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
coreutils/sleep.c
View File

@ -65,15 +65,28 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
{ {
duration_t duration; duration_t duration;
/* Note: sleep_main may be directly called from ash as a builtin.
* This brings some complications:
* + we can't use xfunc here
* + we can't use bb_show_usage
* + applet_name can be the name of the shell
*/
++argv; ++argv;
if (!*argv) if (!*argv) {
/* Without this, bare "sleep" in ash shows _ash_ --help */
if (ENABLE_ASH_SLEEP && applet_name[0] != 's') {
bb_simple_error_msg("sleep: missing operand");
return EXIT_FAILURE;
}
bb_show_usage(); bb_show_usage();
}
/* GNU sleep accepts "inf", "INF", "infinity" and "INFINITY" */ /* GNU sleep accepts "inf", "INF", "infinity" and "INFINITY" */
if (strncasecmp(argv[0], "inf", 3) == 0) if (strncasecmp(argv[0], "inf", 3) == 0)
for (;;) for (;;)
sleep(INT_MAX); sleep(INT_MAX);
//FIXME: in ash, "sleep 123qwerty" as a builtin aborts the shell
#if ENABLE_FEATURE_FANCY_SLEEP #if ENABLE_FEATURE_FANCY_SLEEP
duration = 0; duration = 0;
do { do {

2
procps/kill.c
View File

@ -85,8 +85,8 @@
* This brings some complications: * This brings some complications:
* *
* + we can't use xfunc here * + we can't use xfunc here
* + we can't use applet_name
* + we can't use bb_show_usage * + we can't use bb_show_usage
* + applet_name can be the name of the shell
* (doesn't apply for killall[5], still should be careful b/c NOFORK) * (doesn't apply for killall[5], still should be careful b/c NOFORK)
* *
* kill %n gets translated into kill ' -<process group>' by shell (note space!) * kill %n gets translated into kill ' -<process group>' by shell (note space!)