Merge remote-tracking branch 'upstream/master'

1 files changed, 9 insertions, 2 deletions

diff --git a/shell/ash.c b/shell/ash.c
index ccf4288a9..f7baf2b3b 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -57,7 +57,9 @@
 #include <sys/times.h>
 
 #include "shell_common.h"
-#include "math.h"
+#if ENABLE_SH_MATH_SUPPORT
+# include "math.h"
+#endif
 #if ENABLE_ASH_RANDOM_SUPPORT
 # include "random.h"
 #else
@@ -5834,6 +5836,11 @@ static struct arglist exparg;
 /*
  * Our own itoa().
  */
+#if !ENABLE_SH_MATH_SUPPORT
+/* cvtnum() is used even if math support is off (to prepare $? values and such) */
+typedef long arith_t;
+# define ARITH_FMT "%ld"
+#endif
 static int
 cvtnum(arith_t num)
 {
@@ -13648,7 +13655,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 #endif
-        if (/* argv[0] && */ argv[0][0] == '-')
+        if (argv[0] && argv[0][0] == '-')
                 isloginsh = 1;
         if (isloginsh) {
                 state = 1;