From eedcfcfc7994f469dab12ae759eb74a24a76891c Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 13:58:00 +0100
Subject: [PATCH] Moved WIN32 remove version to own file

---
 Makefile             |  1 +
 src/httplib_remove.c | 40 ++++++++++++++++++++++++++++++++++++++++
 src/libhttp.c        |  8 --------
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 src/httplib_remove.c

diff --git a/Makefile b/Makefile
index d534a6fa..ce642c4d 100644
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_realloc2.c					\
 		src/httplib_redirect_to_https_port.c			\
 		src/httplib_refresh_trust.c				\
+		src/httplib_remove.c					\
 		src/httplib_remove_bad_file.c				\
 		src/httplib_remove_directory.c				\
 		src/httplib_remove_double_dots.c			\
diff --git a/src/httplib_remove.c b/src/httplib_remove.c
new file mode 100644
index 00000000..b3cab0fe
--- /dev/null
+++ b/src/httplib_remove.c
@@ -0,0 +1,40 @@
+/* 
+ * Copyright (c) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+
+#if defined(_WIN32)
+
+static int mg_remove(const struct mg_connection *conn, const char *path) {
+
+	wchar_t wbuf[PATH_MAX];
+	path_to_unicode(conn, path, wbuf, ARRAY_SIZE(wbuf));
+	return DeleteFileW(wbuf) ? 0 : -1;
+}
+
+#endif /* _WIN32 */
diff --git a/src/libhttp.c b/src/libhttp.c
index 5103823a..fe2d4cb7 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -1962,12 +1962,4 @@ static int path_cannot_disclose_cgi(const char *path) {
 	return isalnum(last) || strchr(allowed_last_characters, last) != NULL;
 }
 
-
-static int mg_remove(const struct mg_connection *conn, const char *path) {
-
-	wchar_t wbuf[PATH_MAX];
-	path_to_unicode(conn, path, wbuf, ARRAY_SIZE(wbuf));
-	return DeleteFileW(wbuf) ? 0 : -1;
-}
-
 #endif /* _WIN32 */