Merge pull request #23 from eanon/mingw-support

Added support for Windows native MinGW toolchain

Author: wolkykim

INSTALL.md

@@ -67,3 +67,13 @@ And "index.html" file is provided for your tests.
 
 Analyzing the example codes is probably best starting point.
 But be aware that the examples were written as simple as it can be just to give you straight-forward ideas, so please refer included API document for more details.
+
+## Windows
+
+Windows native MinGW compiler/toolchain (i.e. not using Cygwin or MSYS/MSYS2) support has been added to qDecoder and tested with TDM64-GCC 4.7.1 in Windows 7 64-bit.
+
+These Windows shell scripts will respectively build the 64-bit flavors of qdecoder.dll and the qDecoder's examples towards a "bin" directory. If you need or prefer to target a 32-bit architecture, simply replace "-m64" with "-m32" in these batch files.
+```
+$ build_dll.bat
+$ build_examples.bat
+```

README.md

@@ -100,6 +100,7 @@ The following people have helped with suggestions, ideas, code or fixing bugs:
 (in alphabetical order by first name)
 
 * [Seungyoung "Steve" Kim](https://github.com/wolkykim) - Project Lead
+* [Eric Lequien Esposti](https://github.com/eanon)
 * [Fabrice Fontaine](https://github.com/ffontaine)
 * [Jonh Wendell](https://github.com/jwendell)
 * [nyov](https://github.com/nyov)

build_dll.bat

@@ -0,0 +1,6 @@
+:: Build qDecoder DLL for Windows against MinGW64
+:: Tested under Windows 7 Pro 64-bit against TDM64-GCC 4.7.1
+@echo off
+echo Build qDecoder DLL...
+if not exist bin\ mkdir bin
+gcc -m64 -Wall -O2 -s -shared -D_GNU_SOURCE src\msw_missing.c src\internal.c src\qcgireq.c src\qcgires.c src\qcgisess.c src\qentry.c -o bin\qdecoder.dll

build_examples.bat

@@ -0,0 +1,9 @@
+:: Build qDecoder examples for Windows against MinGW64
+:: Tested under Windows 7 Pro 64-bit against TDM64-GCC 4.7.1
+@echo off
+echo Build qDecoder examples...
+for %%f in (examples\*.c) do (
+    echo . %%~nf.cgi
+    gcc -m64 -Wall -O2 -s -Isrc examples\%%~nf.c -Lbin -lqdecoder -o bin\%%~nf.cgi
+)
+if not exist bin\index.html copy examples\index.html bin\

examples/upload.c

@@ -39,6 +39,10 @@
 #include <sys/stat.h>
 #include "qdecoder.h"
 
+#if defined(__MINGW32__) && defined(_WIN32) && !defined(__CYGWIN__)
+#include "msw_missing.h"
+#endif
+
 #define BASEPATH    "upload"
 
 ssize_t savefile(const char *filepath, const void *buf, size_t size)

src/internal.c

@@ -47,6 +47,10 @@
 #include "qdecoder.h"
 #include "internal.h"
 
+#if defined(__MINGW32__) && defined(_WIN32) && !defined(__CYGWIN__)
+#include "msw_missing.h"
+#endif
+
 // Change two hex character to one hex value.
 char _q_x2c(char hex_up, char hex_low)
 {

src/internal.h

@@ -66,7 +66,12 @@
 /*
  * Internal Definitions
  */
+#if defined(__MINGW32__) && defined(_WIN32) && !defined(__CYGWIN__)
+#define CRLF "\n"
+#else
 #define CRLF "\r\n"
+#endif
+
 #define MAX_LINEBUF (1023+1)
 #define DEF_DIR_MODE  (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
 #define DEF_FILE_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)

src/msw_missing.c

@@ -0,0 +1,81 @@
+/**
+ * Missing declarations and/or definitions in Windows when building against MinGW
+ *
+ * @file msw_missing.c
+ */
+
+#include "msw_missing.h"
+
+static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+int mkstemp (char *tmpl)
+{
+	// mkstemp extracted from libc/sysdeps/posix/tempname.c
+  int len;
+  char *XXXXXX;
+  static unsigned long long value;
+  unsigned long long random_time_bits;
+  unsigned int count;
+  int fd = -1;
+  int save_errno = errno;
+
+#define ATTEMPTS_MIN (62 * 62 * 62)
+#if ATTEMPTS_MIN < TMP_MAX
+  unsigned int attempts = TMP_MAX;
+#else
+  unsigned int attempts = ATTEMPTS_MIN;
+#endif
+
+  len = strlen (tmpl);
+  if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  XXXXXX = &tmpl[len - 6];
+  {
+    SYSTEMTIME      stNow;
+    FILETIME ftNow;
+
+    // get system time
+    GetSystemTime(&stNow);
+    stNow.wMilliseconds = 500;
+    if (!SystemTimeToFileTime(&stNow, &ftNow))
+    {
+        errno = -1;
+        return -1;
+    }
+
+    random_time_bits = (((unsigned long long)ftNow.dwHighDateTime << 32)
+                        | (unsigned long long)ftNow.dwLowDateTime);
+  }
+  value += random_time_bits ^ (unsigned long long)GetCurrentThreadId ();
+
+  for (count = 0; count < attempts; value += 7777, ++count)
+    {
+      unsigned long long v = value;
+      XXXXXX[0] = letters[v % 62];
+      v /= 62;
+      XXXXXX[1] = letters[v % 62];
+      v /= 62;
+      XXXXXX[2] = letters[v % 62];
+      v /= 62;
+      XXXXXX[3] = letters[v % 62];
+      v /= 62;
+      XXXXXX[4] = letters[v % 62];
+      v /= 62;
+      XXXXXX[5] = letters[v % 62];
+
+      fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, _S_IREAD | _S_IWRITE);
+      if (fd >= 0)
+    {
+      errno = save_errno;
+      return fd;
+    }
+      else if (errno != EEXIST)
+    return -1;
+    }
+
+  errno = EEXIST;
+  return -1;
+}

src/msw_missing.h

@@ -0,0 +1,20 @@
+/**
+ * Missing declarations and/or definitions in Windows when building against MinGW
+ *
+ * @file msw_missing.h
+ */
+
+#ifndef MSW_MISSING_H
+#define MSW_MISSING_H
+
+#include <windows.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#define S_IRGRP 0040
+#define S_IROTH 0004
+
+int mkstemp (char *tmpl);
+
+#endif  /* MSW_MISSING_H */

src/qcgireq.c

@@ -143,6 +143,10 @@
 #include "qdecoder.h"
 #include "internal.h"
 
+#if defined(__MINGW32__) && defined(_WIN32) && !defined(__CYGWIN__)
+#include "msw_missing.h"
+#endif
+
 #ifndef _DOXYGEN_SKIP
 static int  _parse_multipart(qentry_t *request);
 static char *_parse_multipart_value_into_memory(char *boundary, int *valuelen,
@@ -660,7 +664,11 @@ static char *_parse_multipart_value_into_disk(const char *boundary,
     }
 
     // change permission
+#if defined(__MINGW32__) && defined(_WIN32) && !defined(__CYGWIN__)
+    chmod(upload_path, DEF_FILE_MODE);
+#else
     fchmod(upload_fd, DEF_FILE_MODE);
+#endif
 
     // read stream
     bool ioerror = false;