From 90253a475fc16c944da0bab5b1eaaddc02230fa0 Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 14:29:39 +0100
Subject: [PATCH] Moved is_file_in_memory to own file

---
 Makefile                        |  1 +
 src/httplib_is_file_in_memory.c | 48 +++++++++++++++++++++++++++++++++
 src/libhttp.c                   | 20 --------------
 3 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 src/httplib_is_file_in_memory.c

diff --git a/Makefile b/Makefile
index 8c0f402c..3f34b9fe 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_initialize_ssl.c				\
 		src/httplib_interpret_uri.c				\
 		src/httplib_is_authorized_for_put.c			\
+		src/httplib_is_file_in_memory.c				\
 		src/httplib_is_not_modified.c				\
 		src/httplib_is_put_or_delete_method.c			\
 		src/httplib_is_valid_http_method.c			\
diff --git a/src/httplib_is_file_in_memory.c b/src/httplib_is_file_in_memory.c
new file mode 100644
index 00000000..154d802d
--- /dev/null
+++ b/src/httplib_is_file_in_memory.c
@@ -0,0 +1,48 @@
+/* 
+ * 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"
+
+
+
+int XX_httplib_is_file_in_memory( const struct mg_connection *conn, const char *path, struct file *filep ) {
+
+	size_t size = 0;
+
+	if (!conn || !filep) return 0;
+
+	if (conn->ctx->callbacks.open_file) {
+		filep->membuf = conn->ctx->callbacks.open_file(conn, path, &size);
+		if (filep->membuf != NULL) {
+			/* NOTE: override filep->size only on success. Otherwise, it might
+			 * break constructs like if (!XX_httplib_stat() || !XX_httplib_fopen()) ... */
+			filep->size = size;
+		}
+	}
+
+	return filep->membuf != NULL;
+
+}  /* XX_httplib_is_file_in_memory */
diff --git a/src/libhttp.c b/src/libhttp.c
index 9c238362..1b2d56c4 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -827,26 +827,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
 #endif
 
 
-int XX_httplib_is_file_in_memory( const struct mg_connection *conn, const char *path, struct file *filep ) {
-
-	size_t size = 0;
-
-	if (!conn || !filep) return 0;
-
-	if (conn->ctx->callbacks.open_file) {
-		filep->membuf = conn->ctx->callbacks.open_file(conn, path, &size);
-		if (filep->membuf != NULL) {
-			/* NOTE: override filep->size only on success. Otherwise, it might
-			 * break constructs like if (!XX_httplib_stat() || !XX_httplib_fopen()) ... */
-			filep->size = size;
-		}
-	}
-
-	return filep->membuf != NULL;
-
-}  /* XX_httplib_is_file_in_memory */
-
-
 bool XX_httplib_is_file_opened( const struct file *filep ) {
 
 	if ( filep == NULL ) return false;