Merge branch 'busybox' into merge

3 files changed, 10 insertions, 12 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index dacfbdd22..379d6af2f 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -1094,7 +1094,7 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
 # endif
 
 # if NUM_APPLETS > 0
-void FAST_FUNC show_usage_if_dash_dash_help(int applet_no, char **argv)
+void FAST_FUNC show_usage_if_dash_dash_help(int applet_no UNUSED_PARAM, char **argv)
 {
         /* Special case. POSIX says "test --help"
          * should be no different from e.g. "test --foo".
diff --git a/libbb/duration.c b/libbb/duration.c
index 793d02f42..0024f1a66 100644
--- a/libbb/duration.c
+++ b/libbb/duration.c
@@ -76,16 +76,14 @@ void FAST_FUNC sleep_for_duration(duration_t duration)
                 ts.tv_sec = duration;
                 ts.tv_nsec = (duration - ts.tv_sec) * 1000000000;
         }
-        /* NB: if ENABLE_ASH_SLEEP, we end up here if "sleep N"
-         * is run in ash. ^C will still work, because ash's signal handler
-         * does not return (it longjumps), the below loop
-         * will not continue looping.
-         * (This wouldn't work in hush)
+        /* NB: ENABLE_ASH_SLEEP requires that we do NOT loop on EINTR here:
+         * otherwise, traps won't execute until we finish looping.
          */
-        do {
-                errno = 0;
-                nanosleep(&ts, &ts);
-        } while (errno == EINTR);
+        //do {
+        //      errno = 0;
+        //      nanosleep(&ts, &ts);
+        //} while (errno == EINTR);
+        nanosleep(&ts, &ts);
 }
 #else
 duration_t FAST_FUNC parse_duration_str(char *str)
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 45d4c33f5..3abc97503 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -254,7 +254,7 @@ static NOINLINE const char *get_homedir_or_NULL(void)
         const char *home;
 
 # if ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH
-        home = state->sh_get_var ? state->sh_get_var("HOME") : getenv("HOME");
+        home = state && state->sh_get_var ? state->sh_get_var("HOME") : getenv("HOME");
 # else
         home = getenv("HOME");
 # endif
@@ -2159,7 +2159,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                         if (!cwd_buf) {
                                                 const char *home;
 # if EDITING_HAS_sh_get_var
-                                                cwd_buf = state->sh_get_var
+                                                cwd_buf = state && state->sh_get_var
                                                         ? xstrdup(state->sh_get_var("PWD"))
                                                         : xrealloc_getcwd_or_warn(NULL);
 # else