rename uhttpd-mimetypes.h to mimetypes.h
authorFelix Fietkau <nbd@openwrt.org>
Tue, 1 Jan 2013 13:32:09 +0000 (14:32 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 1 Jan 2013 14:48:53 +0000 (15:48 +0100)
file.c
mimetypes.h [new file with mode: 0644]
uhttpd-mimetypes.h [deleted file]

diff --git a/file.c b/file.c
index ae4517cfd3e472be430640bb22fa7ea5eddd5b93..e05dc37f9968aed36ea2d65e637002c9d1f06b49 100644 (file)
--- a/file.c
+++ b/file.c
@@ -28,7 +28,7 @@
 #include <libubox/blobmsg.h>
 
 #include "uhttpd.h"
-#include "uhttpd-mimetypes.h"
+#include "mimetypes.h"
 
 static LIST_HEAD(index_files);
 
diff --git a/mimetypes.h b/mimetypes.h
new file mode 100644 (file)
index 0000000..7fd885c
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * uhttpd - Tiny single-threaded httpd - MIME type definitions
+ *
+ *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _UHTTPD_MIMETYPES_
+
+struct mimetype {
+       const char *extn;
+       const char *mime;
+};
+
+static struct mimetype uh_mime_types[] = {
+
+       { "txt",     "text/plain" },
+       { "log",     "text/plain" },
+       { "js",      "text/javascript" },
+       { "css",     "text/css" },
+       { "htm",     "text/html" },
+       { "html",    "text/html" },
+       { "diff",    "text/x-patch" },
+       { "patch",   "text/x-patch" },
+       { "c",       "text/x-csrc" },
+       { "h",       "text/x-chdr" },
+       { "o",       "text/x-object" },
+       { "ko",      "text/x-object" },
+
+       { "bmp",     "image/bmp" },
+       { "gif",     "image/gif" },
+       { "png",     "image/png" },
+       { "jpg",     "image/jpeg" },
+       { "jpeg",    "image/jpeg" },
+       { "svg",     "image/svg+xml" },
+
+       { "zip",     "application/zip" },
+       { "pdf",     "application/pdf" },
+       { "xml",     "application/xml" },
+       { "xsl",     "application/xml" },
+       { "doc",     "application/msword" },
+       { "ppt",     "application/vnd.ms-powerpoint" },
+       { "xls",     "application/vnd.ms-excel" },
+       { "odt",     "application/vnd.oasis.opendocument.text" },
+       { "odp",     "application/vnd.oasis.opendocument.presentation" },
+       { "pl",      "application/x-perl" },
+       { "sh",      "application/x-shellscript" },
+       { "php",     "application/x-php" },
+       { "deb",     "application/x-deb" },
+       { "iso",     "application/x-cd-image" },
+       { "tar.gz",  "application/x-compressed-tar" },
+       { "tgz",     "application/x-compressed-tar" },
+       { "gz",      "application/x-gzip" },
+       { "tar.bz2", "application/x-bzip-compressed-tar" },
+       { "tbz",     "application/x-bzip-compressed-tar" },
+       { "bz2",     "application/x-bzip" },
+       { "tar",     "application/x-tar" },
+       { "rar",     "application/x-rar-compressed" },
+
+       { "mp3",     "audio/mpeg" },
+       { "ogg",     "audio/x-vorbis+ogg" },
+       { "wav",     "audio/x-wav" },
+
+       { "mpg",     "video/mpeg" },
+       { "mpeg",    "video/mpeg" },
+       { "avi",     "video/x-msvideo" },
+
+       { "README",  "text/plain" },
+       { "log",     "text/plain" },
+       { "cfg",     "text/plain" },
+       { "conf",    "text/plain" },
+
+       { "pac",                "application/x-ns-proxy-autoconfig" },
+       { "wpad.dat",   "application/x-ns-proxy-autoconfig" },
+
+       { NULL, NULL }
+};
+
+#endif
+
diff --git a/uhttpd-mimetypes.h b/uhttpd-mimetypes.h
deleted file mode 100644 (file)
index 7fd885c..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * uhttpd - Tiny single-threaded httpd - MIME type definitions
- *
- *   Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#ifndef _UHTTPD_MIMETYPES_
-
-struct mimetype {
-       const char *extn;
-       const char *mime;
-};
-
-static struct mimetype uh_mime_types[] = {
-
-       { "txt",     "text/plain" },
-       { "log",     "text/plain" },
-       { "js",      "text/javascript" },
-       { "css",     "text/css" },
-       { "htm",     "text/html" },
-       { "html",    "text/html" },
-       { "diff",    "text/x-patch" },
-       { "patch",   "text/x-patch" },
-       { "c",       "text/x-csrc" },
-       { "h",       "text/x-chdr" },
-       { "o",       "text/x-object" },
-       { "ko",      "text/x-object" },
-
-       { "bmp",     "image/bmp" },
-       { "gif",     "image/gif" },
-       { "png",     "image/png" },
-       { "jpg",     "image/jpeg" },
-       { "jpeg",    "image/jpeg" },
-       { "svg",     "image/svg+xml" },
-
-       { "zip",     "application/zip" },
-       { "pdf",     "application/pdf" },
-       { "xml",     "application/xml" },
-       { "xsl",     "application/xml" },
-       { "doc",     "application/msword" },
-       { "ppt",     "application/vnd.ms-powerpoint" },
-       { "xls",     "application/vnd.ms-excel" },
-       { "odt",     "application/vnd.oasis.opendocument.text" },
-       { "odp",     "application/vnd.oasis.opendocument.presentation" },
-       { "pl",      "application/x-perl" },
-       { "sh",      "application/x-shellscript" },
-       { "php",     "application/x-php" },
-       { "deb",     "application/x-deb" },
-       { "iso",     "application/x-cd-image" },
-       { "tar.gz",  "application/x-compressed-tar" },
-       { "tgz",     "application/x-compressed-tar" },
-       { "gz",      "application/x-gzip" },
-       { "tar.bz2", "application/x-bzip-compressed-tar" },
-       { "tbz",     "application/x-bzip-compressed-tar" },
-       { "bz2",     "application/x-bzip" },
-       { "tar",     "application/x-tar" },
-       { "rar",     "application/x-rar-compressed" },
-
-       { "mp3",     "audio/mpeg" },
-       { "ogg",     "audio/x-vorbis+ogg" },
-       { "wav",     "audio/x-wav" },
-
-       { "mpg",     "video/mpeg" },
-       { "mpeg",    "video/mpeg" },
-       { "avi",     "video/x-msvideo" },
-
-       { "README",  "text/plain" },
-       { "log",     "text/plain" },
-       { "cfg",     "text/plain" },
-       { "conf",    "text/plain" },
-
-       { "pac",                "application/x-ns-proxy-autoconfig" },
-       { "wpad.dat",   "application/x-ns-proxy-autoconfig" },
-
-       { NULL, NULL }
-};
-
-#endif
-