14 files changed, 139 insertions, 23 deletions

diff --git a/archival/gzip.c b/archival/gzip.c
index a327d5435..958336303 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1577,7 +1577,7 @@ static void compress_block(ct_data * ltree, ct_data * dtree)
  * trees or store, and output the encoded block to the zip file. This function
  * returns the total compressed length for the file so far.
  */
-static ulg flush_block(char *buf, ulg stored_len, int eof)
+static ulg flush_block(char *buf, ulg stored_len, int eof_)
 {
         ulg opt_lenb, static_lenb;      /* opt_len and static_len in bytes */
         int max_blindex;                /* index of last bit length code of non zero freq */
@@ -1615,7 +1615,7 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
          * and if the zip file can be seeked (to rewrite the local header),
          * the whole file is transformed into a stored file:
          */
-        if (stored_len <= opt_lenb && eof && G2.compressed_len == 0L && seekable()) {
+        if (stored_len <= opt_lenb && eof_ && G2.compressed_len == 0L && seekable()) {
                 /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
                 if (buf == NULL)
                         bb_error_msg("block vanished");
@@ -1631,18 +1631,18 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
                  * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
                  * transform a block into a stored block.
                  */
-                send_bits((STORED_BLOCK << 1) + eof, 3);        /* send block type */
+                send_bits((STORED_BLOCK << 1) + eof_, 3);       /* send block type */
                 G2.compressed_len = (G2.compressed_len + 3 + 7) & ~7L;
                 G2.compressed_len += (stored_len + 4) << 3;
 
                 copy_block(buf, (unsigned) stored_len, 1);      /* with header */
 
         } else if (static_lenb == opt_lenb) {
-                send_bits((STATIC_TREES << 1) + eof, 3);
+                send_bits((STATIC_TREES << 1) + eof_, 3);
                 compress_block((ct_data *) G2.static_ltree, (ct_data *) G2.static_dtree);
                 G2.compressed_len += 3 + G2.static_len;
         } else {
-                send_bits((DYN_TREES << 1) + eof, 3);
+                send_bits((DYN_TREES << 1) + eof_, 3);
                 send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1,
                                            max_blindex + 1);
                 compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree);
@@ -1651,12 +1651,12 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
         Assert(G2.compressed_len == G1.bits_sent, "bad compressed size");
         init_block();
 
-        if (eof) {
+        if (eof_) {
                 bi_windup();
                 G2.compressed_len += 7; /* align on byte boundary */
         }
         Tracev((stderr, "\ncomprlen %lu(%lu) ", G2.compressed_len >> 3,
-                        G2.compressed_len - 7 * eof));
+                        G2.compressed_len - 7 * eof_));
 
         return G2.compressed_len >> 3;
 }
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 7c1a0c0df..eb9f8885f 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -168,6 +168,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
         };
         int exitcode = EXIT_FAILURE;
+        int devzero = 0;
         size_t ibs = 512, obs = 512;
         ssize_t n, w;
         char *ibuf, *obuf;
@@ -285,7 +286,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         if (infile != NULL)
-                xmove_fd(xopen(infile, O_RDONLY), ifd);
+                if (ENABLE_PLATFORM_MINGW32 && !strcmp(infile, "/dev/zero")) {
+                        flags |= FLAG_NOERROR;
+                        devzero = 1;
+                }
+                else
+                        xmove_fd(xopen(infile, O_RDONLY), ifd);
         else {
                 infile = bb_msg_standard_input;
         }
@@ -312,7 +318,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         } else {
                 outfile = bb_msg_standard_output;
         }
-        if (skip) {
+        if (skip && !devzero) {
                 if (lseek(ifd, skip * ibs, SEEK_CUR) < 0) {
                         while (skip-- > 0) {
                                 n = safe_read(ifd, ibuf, ibs);
@@ -329,7 +335,12 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
-                n = safe_read(ifd, ibuf, ibs);
+                if (devzero) {
+                        memset(ibuf, 0, ibs);
+                        n = ibs;
+                }
+                else
+                        n = safe_read(ifd, ibuf, ibs);
                 if (n == 0)
                         break;
                 if (n < 0) {
@@ -383,7 +394,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 if (w < 0) goto out_status;
                 if (w > 0) G.out_part++;
         }
-        if (close(ifd) < 0) {
+
+        if (!devzero && close(ifd) < 0) {
  die_infile:
                 bb_simple_perror_msg_and_die(infile);
         }
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 1911f5319..1c8b4af1b 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -41,7 +41,9 @@ static void convert(char *fn, int conv_type)
                 temp_fn = xasprintf("%sXXXXXX", resolved_fn);
                 i = mkstemp(temp_fn);
                 if (i == -1
+#if !ENABLE_PLATFORM_MINGW32
                  || fchmod(i, st.st_mode) == -1
+#endif
                 ) {
                         bb_simple_perror_msg_and_die(temp_fn);
                 }
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 1197f7d71..717b3f493 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -612,7 +612,12 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
         if (all_fmt & LIST_INO)
                 column += printf("%7llu ", (long long) dn->dstat.st_ino);
         if (all_fmt & LIST_BLOCKS)
+#if ENABLE_PLATFORM_MINGW32
+                /* MinGW does not have st_blocks */
+                column += printf("%4"OFF_FMT"u ", (off_t)0);
+#else
                 column += printf("%4"OFF_FMT"u ", (off_t) (dn->dstat.st_blocks >> 1));
+#endif
         if (all_fmt & LIST_MODEBITS)
                 column += printf("%-10s ", (char *) bb_mode_string(dn->dstat.st_mode));
         if (all_fmt & LIST_NLINKS)
@@ -790,6 +795,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
 }
 
 
+#if !ENABLE_PLATFORM_MINGW32
 #if ENABLE_DESKTOP
 /* http://www.opengroup.org/onlinepubs/9699919799/utilities/ls.html
  * If any of the -l, -n, -s options is specified, each list
@@ -818,6 +824,7 @@ static off_t calculate_blocks(struct dnode **dn)
         return blocks >> 1;
 }
 #endif
+#endif
 
 
 static struct dnode **list_dir(const char *, unsigned *);
@@ -843,10 +850,12 @@ static void showdirs(struct dnode **dn, int first)
                         printf("%s:\n", (*dn)->fullname);
                 }
                 subdnp = list_dir((*dn)->fullname, &nfiles);
+#if !ENABLE_PLATFORM_MINGW32
 #if ENABLE_DESKTOP
                 if ((all_fmt & STYLE_MASK) == STYLE_LONG)
                         printf("total %"OFF_FMT"u\n", calculate_blocks(subdnp));
 #endif
+#endif
                 if (nfiles > 0) {
                         /* list all files at this level */
                         dnsort(subdnp, nfiles);
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 6a532fa9d..7b1ab8981 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -84,6 +84,13 @@ typedef long long llong;
 # define LDBL_DIG DBL_DIG
 #endif
 
+#ifdef __MINGW32__
+/* symbol conflict */
+#define CHAR SIZE_CHAR
+#define SHORT SIZE_SHORT
+#define LONG SIZE_LONG
+#define INT SIZE_INT
+#endif
 enum size_spec {
         NO_SIZE,
         CHAR,
diff --git a/coreutils/test.c b/coreutils/test.c
index 5864c7f32..3115ce6e7 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -599,6 +599,29 @@ static int filstat(char *nm, enum token mode)
                 return 0;
         }
 
+#if ENABLE_PLATFORM_MINGW32
+        if (mode == FILEX) {
+                int len = strlen(nm), ret;
+                if (len >= 4 &&
+                    (!strcmp(nm+len-4,".exe") ||
+                     !strcmp(nm+len-4,".com")))
+                        ret = stat(nm, &s);
+                else {
+                        char *exepath;
+                        exepath = malloc(len+5);
+                        memcpy(exepath, nm, len);
+                        memcpy(exepath+len, ".exe", 5);
+                        ret = stat(exepath, &s);
+                        if (ret < 0) {
+                                memcpy(exepath+len, ".exe", 5);
+                                ret = stat(exepath, &s);
+                        }
+                        free(exepath);
+                }
+                return ret >= 0;
+        }
+#endif
+
         if (stat(nm, &s) != 0)
                 return 0;
         if (mode == FILEXIST)
diff --git a/debianutils/which.c b/debianutils/which.c
index 1558e5c6d..59dedf58d 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -36,11 +36,26 @@ int which_main(int argc UNUSED_PARAM, char **argv)
         do {
 #if ENABLE_DESKTOP
 /* Much bloat just to support -a */
-                if (strchr(*argv, '/')) {
+                if (strchr(*argv, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(*argv, '\\'))) {
                         if (execable_file(*argv)) {
                                 puts(*argv);
                                 continue;
                         }
+                        else if (ENABLE_PLATFORM_MINGW32) {
+                                char path[PATH_MAX];
+                                int len = strlen(*argv);
+                                memcpy(path, *argv, len);
+                                memcpy(path+len, ".exe", 5);
+                                if (execable_file(path)) {
+                                        puts(path);
+                                        continue;
+                                }
+                                memcpy(path+len, ".com", 5);
+                                if (execable_file(path)) {
+                                        puts(path);
+                                        continue;
+                                }
+                        }
                         status = EXIT_FAILURE;
                 } else {
                         char *path2 = xstrdup(path);
@@ -66,11 +81,26 @@ int which_main(int argc UNUSED_PARAM, char **argv)
                 }
 #else
 /* Just ignoring -a */
-                if (strchr(*argv, '/')) {
+                if (strchr(*argv, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(*argv, '\\'))) {
                         if (execable_file(*argv)) {
                                 puts(*argv);
                                 continue;
                         }
+                        else if (ENABLE_PLATFORM_MINGW32) {
+                                char path[PATH_MAX];
+                                int len = strlen(*argv);
+                                memcpy(path, *argv, len);
+                                memcpy(path+len, ".exe", 5);
+                                if (execable_file(path)) {
+                                        puts(path);
+                                        continue;
+                                }
+                                memcpy(path+len, ".com", 5);
+                                if (execable_file(path)) {
+                                        puts(path);
+                                        continue;
+                                }
+                        }
                 } else {
                         char *path2 = xstrdup(path);
                         char *tmp = path2;
diff --git a/editors/patch.c b/editors/patch.c
index 62477af16..507112377 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -25,7 +25,7 @@ static unsigned copy_lines(FILE *src_stream, FILE *dst_stream, unsigned lines_co
 {
         while (src_stream && lines_count) {
                 char *line;
-                line = xmalloc_fgets(src_stream);
+                line = xmalloc_fgetline(src_stream);
                 if (line == NULL) {
                         break;
                 }
@@ -180,7 +180,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                 printf("patching file %s\n", new_filename);
 
                 /* Handle all hunks for this file */
-                patch_line = xmalloc_fgets(patch_file);
+                patch_line = xmalloc_fgetline(patch_file);
                 while (patch_line) {
                         unsigned count;
                         unsigned src_beg_line;
@@ -221,7 +221,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                         while (1) {
                                 free(patch_line);
-                                patch_line = xmalloc_fgets(patch_file);
+                                patch_line = xmalloc_fgetline(patch_file);
                                 if (patch_line == NULL)
                                         break; /* EOF */
                                 if (!*patch_line) {
@@ -239,7 +239,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                         if (src_cur_line == src_last_line)
                                                 break;
                                         if (src_stream) {
-                                                src_line = xmalloc_fgets(src_stream);
+                                                src_line = xmalloc_fgetline(src_stream);
                                                 if (src_line) {
                                                         int diff = strcmp(src_line, patch_line + 1);
                                                         src_cur_line++;
diff --git a/findutils/grep.c b/findutils/grep.c
index a321cc31b..318fb4b2f 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -90,6 +90,14 @@ enum {
 #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L)
 #define NUL_DELIMITED               (option_mask32 & OPT_z)
 
+#if ENABLE_PLATFORM_MINGW32
+# define RE_TRANSLATE_TYPE unsigned char*
+# undef ENABLE_EXTRA_COMPAT
+# define ENABLE_EXTRA_COMPAT 0
+# undef IF_EXTRA_COMPAT
+# define IF_EXTRA_COMPAT(x)
+#endif
+
 struct globals {
         int max_matches;
 #if !ENABLE_EXTRA_COMPAT
diff --git a/include/mingw.h b/include/mingw.h
index 0fbc8f528..53a0a0d67 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -112,6 +112,8 @@ struct sigaction {
 int sigaction(int sig, struct sigaction *in, struct sigaction *out);
 sighandler_t mingw_signal(int sig, sighandler_t handler);
 NOIMPL(sigfillset,int *mask UNUSED_PARAM);
+NOIMPL(FAST_FUNC sigprocmask_allsigs, int how UNUSED_PARAM);
+NOIMPL(FAST_FUNC sigaction_set,int signo UNUSED_PARAM, const struct sigaction *sa UNUSED_PARAM);
 
 #define signal mingw_signal
 /*
@@ -143,6 +145,7 @@ int winansi_fprintf(FILE *stream, const char *format, ...) __attribute__((format
 #define WEXITSTATUS(x) ((x) & 0xff)
 #define WIFSIGNALED(x) ((unsigned)(x) > 259)
 #define WTERMSIG(x) ((x) & 0x7f)
+#define WCOREDUMP(x) 0
 
 int clearenv(void);
 char *mingw_getenv(const char *name);
@@ -243,6 +246,7 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out);
  * sys/wait.h
  */
 #define WNOHANG 1
+#define WUNTRACED 2
 int waitpid(pid_t pid, int *status, unsigned options);
 
 /*
diff --git a/libbb/execable.c b/libbb/execable.c
index 96ce9bfb8..06b1c534b 100644
--- a/libbb/execable.c
+++ b/libbb/execable.c
@@ -18,8 +18,11 @@ int FAST_FUNC execable_file(const char *name)
         struct stat s;
         if (ENABLE_PLATFORM_MINGW32) {
                 int len = strlen(name);
-                return len > 4 && !strcasecmp(name+len-4, ".exe") &&
-                        !stat(name, &s) && S_ISREG(s.st_mode);
+                return len > 4 &&
+                        (!strcasecmp(name+len-4, ".exe") ||
+                         !strcasecmp(name+len-4, ".com")) &&
+                        !stat(name, &s) &&
+                        S_ISREG(s.st_mode);
         }
         return (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode));
 }
@@ -43,7 +46,7 @@ char* FAST_FUNC find_execable(const char *filename, char **PATHp)
 
         p = *PATHp;
         while (p) {
-                n = next_path_sep(p);
+                n = (char*)next_path_sep(p);
                 if (n)
                         *n++ = '\0';
                 if (*p != '\0') { /* it's not a PATH="foo::bar" situation */
@@ -54,7 +57,9 @@ char* FAST_FUNC find_execable(const char *filename, char **PATHp)
                         }
                         if (ENABLE_PLATFORM_MINGW32) {
                                 int len = strlen(p);
-                                if (len > 4 && !strcasecmp(p+len-4, ".exe"))
+                                if (len > 4 &&
+                                    (!strcasecmp(p+len-4, ".exe") ||
+                                     !strcasecmp(p+len-4, ".com")))
                                         ; /* nothing, already tested by find_execable() */
                                 else {
                                         char *np = xmalloc(len+4+1);
@@ -64,6 +69,11 @@ char* FAST_FUNC find_execable(const char *filename, char **PATHp)
                                                 *PATHp = n;
                                                 return np;
                                         }
+                                        memcpy(np+len, ".com", 5);
+                                        if (execable_file(np)) {
+                                                *PATHp = n;
+                                                return np;
+                                        }
                                 }
                         }
                         free(p);
diff --git a/scripts/defconfig.mingw32 b/scripts/defconfig.mingw32
index 319d72add..356a08226 100644
--- a/scripts/defconfig.mingw32
+++ b/scripts/defconfig.mingw32
@@ -327,7 +327,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 #
 # Editors
 #
-# CONFIG_AWK is not set
+CONFIG_AWK=y
 # CONFIG_FEATURE_AWK_LIBM is not set
 CONFIG_CMP=y
 CONFIG_DIFF=y
diff --git a/shell/builtin_ulimit.c b/shell/builtin_ulimit.c
index 9f9205eb6..7ef17b1b0 100644
--- a/shell/builtin_ulimit.c
+++ b/shell/builtin_ulimit.c
@@ -16,6 +16,14 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 #include "libbb.h"
+
+#if ENABLE_PLATFORM_MINGW32
+int FAST_FUNC shell_builtin_ulimit(char **argv)
+{
+        return 1;
+}
+#else
+
 #include "builtin_ulimit.h"
 
 
@@ -226,3 +234,4 @@ int FAST_FUNC shell_builtin_ulimit(char **argv)
 
         return 0;
 }
+#endif
diff --git a/win32/process.c b/win32/process.c
index 0936e1c42..13bf81797 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -38,7 +38,9 @@ parse_interpreter(const char *cmd)
 
         /* don't even try a .exe */
         n = strlen(cmd);
-        if (n >= 4 && !strcasecmp(cmd+n-4, ".exe"))
+        if (n >= 4 &&
+            (!strcasecmp(cmd+n-4, ".exe") ||
+             !strcasecmp(cmd+n-4, ".com")))
                 return NULL;
 
         fd = open(cmd, O_RDONLY);