1
0
mirror of https://github.com/lammertb/libhttp.git synced 2026-01-27 08:02:47 +03:00

Moved WIN32 remove version to own file

This commit is contained in:
Lammert Bies
2016-12-11 13:58:00 +01:00
parent c587d71007
commit eedcfcfc79
3 changed files with 41 additions and 8 deletions

View File

@@ -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 \

40
src/httplib_remove.c Normal file
View File

@@ -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 */

View File

@@ -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 */