1 files changed, 40 insertions, 1 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 64e752f4b..1feb49da1 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -970,7 +970,7 @@ static double my_strtod_or_hexoct(char **pp)
 static const char *fmt_num(const char *format, double n)
 {
         if (n == (long long)n) {
-                snprintf(g_buf, MAXVARFMT, "%lld", (long long)n);
+                snprintf(g_buf, MAXVARFMT, "%"LL_FMT"d", (long long)n);
         } else {
                 const char *s = format;
                 char c;
@@ -2929,6 +2929,15 @@ static int try_to_assign(const char *expr)
         return TRUE;
 }
 
+
+#if ENABLE_PLATFORM_MINGW32
+static void set_text_mode(FILE *f)
+{
+        if (f)
+                _setmode(fileno(f), _O_TEXT);
+}
+#endif
+
 /* switch to next input file */
 static int next_input_file(void)
 {
@@ -2972,6 +2981,9 @@ static int next_input_file(void)
                         break;
                 }
         }
+#if ENABLE_PLATFORM_MINGW32
+        set_text_mode(iF.F);
+#endif
 
         setvar_s(intvar[FILENAME], fname);
         input_file_seen = TRUE;
@@ -2980,6 +2992,17 @@ static int next_input_file(void)
 #undef input_file_seen
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static unsigned triple32(unsigned x)
+{
+        x ^= x >> 17; x *= 0xed5ad4bb;
+        x ^= x >> 11; x *= 0xac4c1b51;
+        x ^= x >> 15; x *= 0x31848bab;
+        x ^= x >> 14;
+        return x;
+}
+#endif
+
 /*
  * Evaluate node - the heart of the program. Supplied with subtree
  * and "res" variable to assign the result to if we evaluate an expression.
@@ -3361,6 +3384,9 @@ static var *evaluate(node *op, var *res)
                                         } else {
                                                 rsm->F = fopen_for_read(L.s);  /* not xfopen! */
                                         }
+#if ENABLE_PLATFORM_MINGW32
+                                        set_text_mode(rsm->F);
+#endif
                                 }
                         } else {
                                 if (!iF.F)
@@ -3412,6 +3438,12 @@ static var *evaluate(node *op, var *res)
                                 v &= 0x7fffffffffffffffULL;
 # endif
                                 R_d = (double)v / 0x8000000000000000ULL;
+#elif ENABLE_PLATFORM_MINGW32 && RAND_MAX == 0x7fff
+                                /* 45 bits of randomness ought to be enough for anyone */
+                                uint64_t v = ((uint64_t)rand() << 18) |
+                                                                ((uint64_t)rand() << 33) |
+                                                                ((uint64_t)rand() << 48);
+                                R_d = (double)v / 0x8000000000000000ULL;
 #else
 # error Not implemented for this value of RAND_MAX
 #endif
@@ -3453,7 +3485,11 @@ static var *evaluate(node *op, var *res)
                         case F_sr:
                                 R_d = (double)seed;
                                 seed = op1 ? (unsigned)L_d : (unsigned)time(NULL);
+#if ENABLE_PLATFORM_MINGW32
+                                srand(seed == 1 ? 1 : triple32(seed));
+#else
                                 srand(seed);
+#endif
                                 break;
 
                         case F_ti: /*systime*/
@@ -3797,6 +3833,9 @@ int awk_main(int argc UNUSED_PARAM, char **argv)
                         char *s;
                         g_progname = optarg;
                         fd = xopen_stdin(g_progname);
+#if ENABLE_PLATFORM_MINGW32
+                        _setmode(fd, _O_TEXT);
+#endif
                         s = xmalloc_read(fd, NULL); /* it's NUL-terminated */
                         if (!s)
                                 bb_perror_msg_and_die("read error from '%s'", g_progname);