3 files changed, 88 insertions, 8 deletions

diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 720098a23..bfc1a9844 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -38,7 +38,9 @@
 #include <unistd.h>
 #include <limits.h>
 #include <sys/types.h>
+#ifndef __MINGW32__
 #include <sys/wait.h>
+#endif
 //bbox disabled: #include <alloca.h>
 
 /* exitstatus is used to keep track of any failing calls to kernel-doc,
@@ -78,12 +80,24 @@ void usage (void)
  */
 void exec_kernel_doc(char **svec)
 {
+#ifndef __MINGW32__
         pid_t pid;
         int ret;
+#endif
         char *real_filename;
         int rflen;
 
         /* Make sure output generated so far are flushed */
+#ifdef __MINGW32__
+        fflush(stdout);
+        rflen  = strlen(getenv("SRCTREE"));
+        rflen += strlen(KERNELDOCPATH KERNELDOC);
+        real_filename = alloca(rflen + 1);
+        strcpy(real_filename, getenv("SRCTREE"));
+        strcat(real_filename, KERNELDOCPATH KERNELDOC);
+        fprintf(stderr, "NOTIMPL: exec %s\n", real_filename);
+        exit(1);
+#else
         fflush(stdout);
         switch(pid=fork()) {
                 case -1:
@@ -106,6 +120,7 @@ void exec_kernel_doc(char **svec)
                 exitstatus |= WEXITSTATUS(ret);
         else
                 exitstatus = 0xff;
+#endif
 }
 
 /* Types used to create list of all exported symbols in a number of files */
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 19f82df09..9f461a65b 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -104,7 +104,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef __MINGW32__
 #include <sys/mman.h>
+#endif
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
@@ -112,7 +114,9 @@
 #include <stdio.h>
 #include <limits.h>
 #include <ctype.h>
+#ifndef __MINGW32__
 #include <arpa/inet.h>
+#endif
 //bbox disabled: #include <alloca.h>
 
 /* bbox: not needed
@@ -122,6 +126,57 @@
 #define INT_FIG_ ntohl(0x4649475f)
 */
 
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+#ifdef __MINGW32__
+#define UNUSED __attribute__ ((__unused__))
+
+/* Workaround specifically for fixdep */
+#define PROT_READ 0
+#define MAP_PRIVATE 0
+void *mmap(void *start UNUSED, size_t size, int prot UNUSED,
+           int flags UNUSED, int fd, off_t offset UNUSED)
+{
+        void *p;
+        void *curP;
+        ssize_t readB;
+
+        p = malloc(size);
+        if (!p)
+                return (void*)((long)-1);
+
+        curP = p;
+
+        while (size > 0)
+        {
+                readB = read(fd, curP, size);
+
+                if (readB == 0)
+                {
+                        /* EOF reached */
+                        break;
+                }
+                else if (readB < 0)
+                {
+                        perror("fixdep: read config");
+                        free(p);
+                        return (void*)((long)-1);
+                }
+
+                size -= readB;
+                curP += readB;
+        }
+
+        return p;
+}
+void munmap(void *p, size_t size UNUSED)
+{
+        free(p);
+}
+#endif
+
 char *target;
 char *depfile;
 char *cmdline;
@@ -286,7 +341,7 @@ void do_config_file(char *filename)
         int fd;
         void *map;
 
-        fd = open(filename, O_RDONLY);
+        fd = open(filename, O_RDONLY | O_BINARY);
         if (fd < 0) {
                 fprintf(stderr, "fixdep: ");
                 perror(filename);
@@ -298,7 +353,7 @@ void do_config_file(char *filename)
                 return;
         }
         map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-        if ((long) map == -1) {
+        if ((intptr_t) map == -1) {
                 perror("fixdep: mmap");
                 close(fd);
                 return;
@@ -334,10 +389,12 @@ void parse_dep_file(void *map, size_t len)
                         m++;
                 p = m;
                 while (p < end && *p != ' ') p++;
+                if (p == m) break;
                 if (p == end) {
-                        do p--; while (!isalnum(*p));
+                        do p--; while (p != m && !isalnum(*p));
                         p++;
                 }
+                if (p == m) break;
                 memcpy(s, m, p-m); s[p-m] = 0;
                 if (strrcmp(s, "include/autoconf.h") &&
                     strrcmp(s, "arch/um/include/uml-config.h") &&
@@ -345,6 +402,7 @@ void parse_dep_file(void *map, size_t len)
                         printf("  %s \\\n", s);
                         do_config_file(s);
                 }
+                if (p == end) break;
                 m = p + 1;
         }
         printf("\n%s: $(deps_%s)\n\n", target, target);
@@ -357,7 +415,7 @@ void print_deps(void)
         int fd;
         void *map;
 
-        fd = open(depfile, O_RDONLY);
+        fd = open(depfile, O_RDONLY | O_BINARY);
         if (fd < 0) {
                 fprintf(stderr, "fixdep: ");
                 perror(depfile);
@@ -370,7 +428,7 @@ void print_deps(void)
                 return;
         }
         map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-        if ((long) map == -1) {
+        if ((intptr_t) map == -1) {
                 perror("fixdep: mmap");
                 close(fd);
                 return;
diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c
index e328788e2..8127fe261 100644
--- a/scripts/basic/split-include.c
+++ b/scripts/basic/split-include.c
@@ -39,8 +39,6 @@
         exit(1);                                                        \
     }
 
-
-
 int main(int argc, const char * argv [])
 {
     const char * str_my_name;
@@ -89,7 +87,11 @@ int main(int argc, const char * argv [])
     /* Make output directory if needed. */
     if (stat(str_dir_config, &stat_buf) != 0)
     {
+#ifdef __MINGW32__
+        if (mkdir(str_dir_config) != 0)
+#else
         if (mkdir(str_dir_config, 0755) != 0)
+#endif
             ERROR_EXIT(str_dir_config);
     }
 
@@ -148,7 +150,12 @@ int main(int argc, const char * argv [])
                 {
                     ptarget[islash] = '\0';
                     if (stat(ptarget, &stat_buf) != 0
-                    &&  mkdir(ptarget, 0755)     != 0)
+#ifdef __MINGW32__
+                    &&  mkdir(ptarget)           != 0
+#else
+                    &&  mkdir(ptarget, 0755)     != 0
+#endif
+                    )
                         ERROR_EXIT( ptarget );
                     ptarget[islash] = '/';
                 }