From b44c790e41e281965955a83408f35ea53ecdb3d2 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Mon, 17 Mar 2008 09:29:43 +0000
Subject: *: fix various kinds of damage to letter 'c' in Arkadiusz Mickiewicz'
 surname. chrt,taskset,dc,eject: shrink crontab: call "vi" with just name, no
 path watchdog: intercept all fatal signals

function                                             old     new   delta
xstrtoull_range                                        -      35     +35
static.sg_commands                                     -      18     +18
packed_usage                                       23698   23712     +14
watchdog_main                                        148     151      +3
crontab_main                                         637     638      +1
base                                                   1       -      -1
static.ps                                              4       -      -4
pointer                                                4       -      -4
stack_machine                                         99      92      -7
run_command                                          273     260     -13
eject_main                                           360     343     -17
static.C                                              30      12     -18
ptok                                                  61      38     -23
xstrtol_range                                         27       -     -27
get_token                                             35       -     -35
taskset_main                                         586     550     -36
chrt_main                                            411     372     -39
dc_main                                              158     117     -41
time_main                                           1127    1037     -90
------------------------------------------------------------------------------
(add/remove: 2/5 grow/shrink: 3/9 up/down: 71/-355)          Total: -284 bytes
   text    data     bss     dec     hex filename
 793680     662    7420  801762   c3be2 busybox_old
 793327     662    7412  801401   c3a79 busybox_unstripped
---
 include/libbb.h | 4 ++--
 include/usage.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/libbb.h b/include/libbb.h
index 99d681dbe..654643743 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -707,7 +707,7 @@ int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **
  *
  * forkexit_or_rexec(argv) = bare-bones "fork + parent exits" on MMU,
  *      "vfork + re-exec ourself" on NOMMU. No fd redirection, no setsid().
- *      Currently used for openvt. On MMU ignores argv.
+ *      Currently used for openvt and setsid. On MMU ignores argv.
  *
  * Helper for network daemons in foreground mode:
  *
@@ -728,7 +728,7 @@ enum {
 # define bb_daemonize(flags)                bb_daemonize_or_rexec(flags, bogus)
 #else
   void re_exec(char **argv) ATTRIBUTE_NORETURN;
-  void forkexit_or_rexec(char **argv);
+  void forkexit_or_rexec(char **argv) ATTRIBUTE_NORETURN;
   extern bool re_execed;
   int  BUG_fork_is_unavailable_on_nommu(void);
   int  BUG_daemon_is_unavailable_on_nommu(void);
diff --git a/include/usage.h b/include/usage.h
index 8f563f55e..fe98398ab 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -3839,7 +3839,7 @@
        "$ tar -cf /tmp/tarball.tar /usr/local\n"
 
 #define taskset_trivial_usage \
-       "[OPTIONS] [mask] [pid | command [arg]...]"
+       "[-p] [mask] [pid | command [arg]...]"
 #define taskset_full_usage \
        "Set or get CPU affinity\n" \
      "\nOptions:" \
-- 
cgit v1.2.3