From d68ba2234026b2e6ed406cb56299dad1afb0ef03 Mon Sep 17 00:00:00 2001 From: Lammert Bies Date: Sun, 11 Dec 2016 20:03:17 +0100 Subject: [PATCH] Moved WINCE rename to own file --- Makefile | 1 + src/libhttp.c | 11 ----------- src/wince_rename.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 src/wince_rename.c diff --git a/Makefile b/Makefile index 3d9a9afd..e3222754 100644 --- a/Makefile +++ b/Makefile @@ -257,6 +257,7 @@ LIB_SOURCES = src/libhttp.c \ src/wince_gmtime_s.c \ src/wince_localtime.c \ src/wince_localtime_s.c \ + src/wince_rename.c \ src/wince_strftime.c \ src/wince_time.c LIB_INLINE = src/mod_lua.inl src/md5.inl diff --git a/src/libhttp.c b/src/libhttp.c index 5342a656..c14926b2 100644 --- a/src/libhttp.c +++ b/src/libhttp.c @@ -130,17 +130,6 @@ pthread_mutexattr_t XX_httplib_pthread_mutex_attr; #define remove(f) mg_remove(NULL, f) -int rename( const char *a, const char *b ) { - - wchar_t wa[PATH_MAX]; - wchar_t wb[PATH_MAX]; - - XX_httplib_path_to_unicode( NULL, a, wa, ARRAY_SIZE(wa) ); - XX_httplib_path_to_unicode( NULL, b, wb, ARRAY_SIZE(wb) ); - - return MoveFileW( wa, wb ) ? 0 : -1; - -} /* rename */ struct stat { int64_t st_size; diff --git a/src/wince_rename.c b/src/wince_rename.c new file mode 100644 index 00000000..42692e2d --- /dev/null +++ b/src/wince_rename.c @@ -0,0 +1,45 @@ +/* + * 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_WCE) + +int rename( const char *a, const char *b ) { + + wchar_t wa[PATH_MAX]; + wchar_t wb[PATH_MAX]; + + XX_httplib_path_to_unicode( NULL, a, wa, ARRAY_SIZE(wa) ); + XX_httplib_path_to_unicode( NULL, b, wb, ARRAY_SIZE(wb) ); + + return MoveFileW( wa, wb ) ? 0 : -1; + +} /* rename */ + +#endif /* defined(_WIN32_WCE) */