Merge branch 'busybox' into merge

3 files changed, 14 insertions, 5 deletions

diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 378510063..5ab4d66f1 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -89,6 +89,12 @@ getopt32(char **argv, const char *applet_opts, ...)
         root:x:0:0:root:/root:/bin/bash
         user:x:500:500::/home/user:/bin/bash
 
+ "^"    options string is "^optchars""\0""opt_complementary".
+
+ "!"    If the first character in the applet_opts string is a '!',
+        report bad options, missing required options,
+        inconsistent options with all-ones return value (instead of abort.
+
  "+"    If the first character in the applet_opts string is a plus,
         then option processing will stop as soon as a non-option is
         encountered in the argv array.  Useful for applets like env
@@ -96,10 +102,7 @@ getopt32(char **argv, const char *applet_opts, ...)
         env -i ls -d /
         Here we want env to process just the '-i', not the '-d'.
 
- "!"    Report bad options, missing required options,
-        inconsistent options with all-ones return value (instead of abort).
-
- "^"    options string is "^optchars""\0""opt_complementary".
+        (The order of multiple prefixes must be "^!+...")
 
 uint32_t
 getopt32long(char **argv, const char *applet_opts, const char *logopts...)
diff --git a/libbb/signals.c b/libbb/signals.c
index e64ba5023..c09a562ed 100644
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -58,7 +58,7 @@ void FAST_FUNC bb_signals(int sigs, void (*f)(int))
         }
 }
 
-void FAST_FUNC bb_signals_recursive_norestart(int sigs, void (*f)(int))
+void FAST_FUNC bb_signals_norestart(int sigs, void (*f)(int))
 {
         int sig_no = 0;
         int bit = 1;
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index ef990118e..102b5a227 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -305,6 +305,12 @@ int FAST_FUNC get_terminal_width(int fd)
         return width;
 }
 
+int FAST_FUNC is_TERM_dumb(void)
+{
+        char *term = getenv("TERM");
+        return term && strcmp(term, "dumb") == 0;
+}
+
 #if !ENABLE_PLATFORM_MINGW32
 int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
 {