9 files changed, 35 insertions, 3 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 99f0cb89c..a90d0cdb5 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -319,7 +319,6 @@ void lbb_prepare(const char *applet
         /* Redundant for busybox (run_applet_and_exit covers that case)
          * but needed for "individual applet" mode */
         if (argv[1]
-         && !argv[2]
          && strcmp(argv[1], "--help") == 0
          && !is_prefixed_with(applet, "busybox")
         ) {
@@ -1115,12 +1114,15 @@ void FAST_FUNC show_usage_if_dash_dash_help(int applet_no, char **argv)
 #  if defined APPLET_NO_echo
          && applet_no != APPLET_NO_echo
 #  endif
+#  if ENABLE_TEST1 || ENABLE_TEST2
+         && argv[0][0] != '[' /* exclude [ --help ] and [[ --help ]] too */
+#  endif
 #  if ENABLE_PLATFORM_MINGW32 && defined APPLET_NO_busybox
          && applet_no != APPLET_NO_busybox
 #  endif
         ) {
-                if (argv[1] && !argv[2] && strcmp(argv[1], "--help") == 0) {
-                        /* Make "foo --help" exit with 0: */
+                if (argv[1] && strcmp(argv[1], "--help") == 0) {
+                        /* Make "foo --help [...]" exit with 0: */
                         xfunc_error_retval = 0;
                         bb_show_usage();
                 }
diff --git a/libbb/duration.c b/libbb/duration.c
index a6a29ddae..793d02f42 100644
--- a/libbb/duration.c
+++ b/libbb/duration.c
@@ -76,6 +76,12 @@ 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)
+         */
         do {
                 errno = 0;
                 nanosleep(&ts, &ts);
diff --git a/libbb/hash_md5_sha256_x86-32_shaNI.S b/libbb/hash_md5_sha256_x86-32_shaNI.S
index 3905bad9a..a0e4a571a 100644
--- a/libbb/hash_md5_sha256_x86-32_shaNI.S
+++ b/libbb/hash_md5_sha256_x86-32_shaNI.S
@@ -19,6 +19,9 @@
 // We do not check SSSE3 in cpuid,
 // all SHA-capable CPUs support it as well.
 
+#ifdef __linux__
+        .section        .note.GNU-stack, "", @progbits
+#endif
         .section        .text.sha256_process_block64_shaNI, "ax", @progbits
         .globl  sha256_process_block64_shaNI
         .hidden sha256_process_block64_shaNI
diff --git a/libbb/hash_md5_sha256_x86-64_shaNI.S b/libbb/hash_md5_sha256_x86-64_shaNI.S
index 082ceafe4..172c2eae2 100644
--- a/libbb/hash_md5_sha256_x86-64_shaNI.S
+++ b/libbb/hash_md5_sha256_x86-64_shaNI.S
@@ -19,6 +19,9 @@
 // We do not check SSSE3 in cpuid,
 // all SHA-capable CPUs support it as well.
 
+#ifdef __linux__
+        .section        .note.GNU-stack, "", @progbits
+#endif
         .section        .text.sha256_process_block64_shaNI, "ax", @progbits
         .globl  sha256_process_block64_shaNI
         .hidden sha256_process_block64_shaNI
diff --git a/libbb/hash_md5_sha_x86-32_shaNI.S b/libbb/hash_md5_sha_x86-32_shaNI.S
index 2366b046a..7455a29f0 100644
--- a/libbb/hash_md5_sha_x86-32_shaNI.S
+++ b/libbb/hash_md5_sha_x86-32_shaNI.S
@@ -25,6 +25,9 @@
 // We do not check SSSE3/SSE4.1 in cpuid,
 // all SHA-capable CPUs support them as well.
 
+#ifdef __linux__
+        .section        .note.GNU-stack, "", @progbits
+#endif
         .section        .text.sha1_process_block64_shaNI, "ax", @progbits
         .globl  sha1_process_block64_shaNI
         .hidden sha1_process_block64_shaNI
diff --git a/libbb/hash_md5_sha_x86-64.S b/libbb/hash_md5_sha_x86-64.S
index 1d55b91f8..2cdd22015 100644
--- a/libbb/hash_md5_sha_x86-64.S
+++ b/libbb/hash_md5_sha_x86-64.S
@@ -1,6 +1,9 @@
 ### Generated by hash_md5_sha_x86-64.S.sh ###
 
 #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
+#ifdef __linux__
+        .section        .note.GNU-stack, "", @progbits
+#endif
         .section        .text.sha1_process_block64, "ax", @progbits
         .globl  sha1_process_block64
         .hidden sha1_process_block64
diff --git a/libbb/hash_md5_sha_x86-64.S.sh b/libbb/hash_md5_sha_x86-64.S.sh
index 40c979d35..653fe4989 100755
--- a/libbb/hash_md5_sha_x86-64.S.sh
+++ b/libbb/hash_md5_sha_x86-64.S.sh
@@ -127,6 +127,9 @@ echo \
 "### Generated by hash_md5_sha_x86-64.S.sh ###
 
 #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
+#ifdef __linux__
+        .section        .note.GNU-stack, \"\", @progbits
+#endif
         .section        .text.sha1_process_block64, \"ax\", @progbits
         .globl  sha1_process_block64
         .hidden sha1_process_block64
diff --git a/libbb/hash_md5_sha_x86-64_shaNI.S b/libbb/hash_md5_sha_x86-64_shaNI.S
index 794e97040..2f03e1ce4 100644
--- a/libbb/hash_md5_sha_x86-64_shaNI.S
+++ b/libbb/hash_md5_sha_x86-64_shaNI.S
@@ -25,6 +25,9 @@
 // We do not check SSSE3/SSE4.1 in cpuid,
 // all SHA-capable CPUs support them as well.
 
+#ifdef __linux__
+        .section        .note.GNU-stack, "", @progbits
+#endif
         .section        .text.sha1_process_block64_shaNI, "ax", @progbits
         .globl  sha1_process_block64_shaNI
         .hidden sha1_process_block64_shaNI
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 6994d1da7..c5d5808f5 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2154,7 +2154,13 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 case 'W': /* basename of cur dir */
                                         if (!cwd_buf) {
                                                 const char *home;
+#if ENABLE_SHELL_ASH
+                                                cwd_buf = state->sh_get_var
+                                                        ? xstrdup(state->sh_get_var("PWD"))
+                                                        : xrealloc_getcwd_or_warn(NULL);
+#else
                                                 cwd_buf = xrealloc_getcwd_or_warn(NULL);
+#endif
                                                 if (!cwd_buf)
                                                         cwd_buf = (char *)bb_msg_unknown;
                                                 else if ((home = get_homedir_or_NULL()) != NULL && home[0]) {