Merge branch 'busybox' into merge

4 files changed, 8 insertions, 5 deletions

diff --git a/libbb/get_shell_name.c b/libbb/get_shell_name.c
index c930afd94..5aebe9cdc 100644
--- a/libbb/get_shell_name.c
+++ b/libbb/get_shell_name.c
@@ -8,7 +8,7 @@
 
 #include "libbb.h"
 
-const char *get_shell_name(void)
+const char* FAST_FUNC get_shell_name(void)
 {
         struct passwd *pw;
         char *shell;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 65dffe56d..8a276d941 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2754,7 +2754,8 @@ int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize)
 {
         fputs(prompt, stdout);
         fflush_all();
-        fgets(command, maxsize, stdin);
+        if (!fgets(command, maxsize, stdin))
+                return -1;
         return strlen(command);
 }
 
diff --git a/libbb/procps.c b/libbb/procps.c
index 1080e0165..c6977da51 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -586,6 +586,8 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
                 buf[sz] = '\0';
                 while (--sz >= 0 && buf[sz] == '\0')
                         continue;
+                /* Prevent basename("process foo/bar") = "bar" */
+                strchrnul(buf, ' ')[0] = '\0';
                 base = bb_basename(buf); /* before we replace argv0's NUL with space */
                 while (sz >= 0) {
                         if ((unsigned char)(buf[sz]) < ' ')
diff --git a/libbb/signals.c b/libbb/signals.c
index cdc37b1ef..56512473a 100644
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -39,7 +39,7 @@ void FAST_FUNC bb_signals(int sigs, void (*f)(int))
 
         while (sigs) {
                 if (sigs & bit) {
-                        sigs &= ~bit;
+                        sigs -= bit;
                         signal(sig_no, f);
                 }
                 sig_no++;
@@ -60,7 +60,7 @@ void FAST_FUNC bb_signals_recursive_norestart(int sigs, void (*f)(int))
 
         while (sigs) {
                 if (sigs & bit) {
-                        sigs &= ~bit;
+                        sigs -= bit;
                         sigaction_set(sig_no, &sa);
                 }
                 sig_no++;
@@ -97,7 +97,7 @@ void FAST_FUNC kill_myself_with_sig(int sig)
         signal(sig, SIG_DFL);
         sig_unblock(sig);
         raise(sig);
-        _exit(EXIT_FAILURE); /* Should not reach it */
+        _exit(sig | 128); /* Should not reach it */
 }
 
 void FAST_FUNC signal_SA_RESTART_empty_mask(int sig, void (*handler)(int))