Merge branch 'busybox' into merge

4 files changed, 41 insertions, 17 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3ff2b5dc6..8efb1754a 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -134,16 +134,16 @@ void FAST_FUNC bb_show_usage(void)
 {
         if (ENABLE_SHOW_USAGE) {
 #ifdef SINGLE_APPLET_STR
-                /* Imagine that this applet is "true". Dont suck in printf! */
+                /* Imagine that this applet is "true". Dont link in printf! */
                 const char *usage_string = unpack_usage_messages();
 
                 if (usage_string) {
                         if (*usage_string == '\b') {
-                                full_write2_str("No help available.\n\n");
+                                full_write2_str("No help available\n");
                         } else {
                                 full_write2_str("Usage: "SINGLE_APPLET_STR" ");
                                 full_write2_str(usage_string);
-                                full_write2_str("\n\n");
+                                full_write2_str("\n");
                         }
                         if (ENABLE_FEATURE_CLEAN_UP)
                                 dealloc_usage_messages((char*)usage_string);
@@ -162,7 +162,7 @@ void FAST_FUNC bb_show_usage(void)
                 full_write2_str(bb_banner);
                 full_write2_str(" multi-call binary\n");
                 if (*p == '\b')
-                        full_write2_str("\nNo help available.\n\n");
+                        full_write2_str("\nNo help available\n");
                 else {
                         full_write2_str("\nUsage: ");
                         full_write2_str(applet_name);
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 11a77ec69..0b4e326d8 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1444,6 +1444,16 @@ void FAST_FUNC show_history(const line_input_t *st)
                 printf("%4d %s\n", i, st->history[i]);
 }
 
+void FAST_FUNC free_line_input_t(line_input_t *n)
+{
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY
+        int i = n->cnt_history;
+        while (i > 0)
+                free(n->history[--i]);
+#endif
+        free(n);
+}
+
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
 /* We try to ensure that concurrent additions to the history
  * do not overwrite each other.
@@ -1453,14 +1463,6 @@ void FAST_FUNC show_history(const line_input_t *st)
  * than configured MAX_HISTORY lines.
  */
 
-static void free_line_input_t(line_input_t *n)
-{
-        int i = n->cnt_history;
-        while (i > 0)
-                free(n->history[--i]);
-        free(n);
-}
-
 /* state->flags is already checked to be nonzero */
 static void load_history(line_input_t *st_parm)
 {
@@ -2380,6 +2382,18 @@ static int32_t reverse_i_search(int timeout)
 }
 #endif
 
+#if ENABLE_FEATURE_EDITING_WINCH
+static void sigaction2(int sig, struct sigaction *act)
+{
+        // Grr... gcc 8.1.1:
+        // "passing argument 3 to restrict-qualified parameter aliases with argument 2"
+        // dance around that...
+        struct sigaction *oact FIX_ALIASING;
+        oact = act;
+        sigaction(sig, act, oact);
+}
+#endif
+
 /* maxsize must be >= 2.
  * Returns:
  * -1 on read errors or EOF, or on bare Ctrl-D,
@@ -2500,7 +2514,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         /* Install window resize handler (NB: after *all* init is complete) */
         S.SIGWINCH_handler.sa_handler = win_changed;
         S.SIGWINCH_handler.sa_flags = SA_RESTART;
-        sigaction(SIGWINCH, &S.SIGWINCH_handler, &S.SIGWINCH_handler);
+        sigaction2(SIGWINCH, &S.SIGWINCH_handler);
 #endif
         read_key_buffer[0] = 0;
         while (1) {
diff --git a/libbb/procps.c b/libbb/procps.c
index 2484ab2d9..e6892d7ff 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -121,11 +121,11 @@ void FAST_FUNC free_procps_scan(procps_status_t* sp)
 }
 
 #if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
-static unsigned long fast_strtoul_16(char **endptr)
+static unsigned long long fast_strtoull_16(char **endptr)
 {
         unsigned char c;
         char *str = *endptr;
-        unsigned long n = 0;
+        unsigned long long n = 0;
 
         /* Need to stop on both ' ' and '\n' */
         while ((c = *str++) > ' ') {
@@ -239,8 +239,8 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
 
                         *tp = ' ';
                         tp = buf;
-                        currec.smap_start = fast_strtoul_16(&tp);
-                        currec.smap_size = (fast_strtoul_16(&tp) - currec.smap_start) >> 10;
+                        currec.smap_start = fast_strtoull_16(&tp);
+                        currec.smap_size = (fast_strtoull_16(&tp) - currec.smap_start) >> 10;
 
                         strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1);
 
diff --git a/libbb/signals.c b/libbb/signals.c
index 3f589321c..d3d84ef6a 100644
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -31,6 +31,16 @@ int FAST_FUNC sigprocmask_allsigs(int how)
         return sigprocmask(how, &set, NULL);
 }
 
+int FAST_FUNC sigprocmask2(int how, sigset_t *set)
+{
+        // Grr... gcc 8.1.1:
+        // "passing argument 3 to restrict-qualified parameter aliases with argument 2"
+        // dance around that...
+        sigset_t *oset FIX_ALIASING;
+        oset = set;
+        return sigprocmask(how, set, oset);
+}
+
 void FAST_FUNC bb_signals(int sigs, void (*f)(int))
 {
         int sig_no = 0;