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

Moved httplib_fopen to own file

Browse Source
This commit is contained in:
Lammert Bies
2016-12-11 14:33:21 +01:00
parent e35b560e5a
commit 2f4e7d46c2
3 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -66,6 +66,7 @@ LIB_SOURCES = src/libhttp.c \
src/httplib_download.c \
src/httplib_fclose_on_exec.c \
src/httplib_fgets.c \
src/httplib_fopen.c \
src/httplib_forward_body_data.c \
src/httplib_free_context.c \
src/httplib_get_builtin_mime_type.c \

63
src/httplib_fopen.c Normal file
View File

@@ -0,0 +1,63 @@
/*
* 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"
/* XX_httplib_fopen will open a file either in memory or on the disk.
* The input parameter path is a string in UTF-8 encoding.
* The input parameter mode is the same as for fopen.
* Either fp or membuf will be set in the output struct filep.
* The function returns 1 on success, 0 on error. */
int XX_httplib_fopen( const struct mg_connection *conn, const char *path, const char *mode, struct file *filep ) {
struct stat st;
if (!filep) return 0;
/* TODO (high): XX_httplib_fopen should only open a file, while XX_httplib_stat should
* only get the file status. They should not work on different members of
* the same structure (bad cohesion). */
memset(filep, 0, sizeof(*filep));
if (stat(path, &st) == 0) filep->size = (uint64_t)(st.st_size);
if (!XX_httplib_is_file_in_memory(conn, path, filep)) {
#ifdef _WIN32
wchar_t wbuf[PATH_MAX], wmode[20];
XX_httplib_path_to_unicode(conn, path, wbuf, ARRAY_SIZE(wbuf));
MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, ARRAY_SIZE(wmode));
filep->fp = _wfopen(wbuf, wmode);
#else
/* Linux et al already use unicode. No need to convert. */
filep->fp = fopen(path, mode);
#endif
}
return XX_httplib_is_file_opened(filep);
} /* XX_httplib_fopen */

36
src/libhttp.c
View File

@@ -828,42 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
/* XX_httplib_fopen will open a file either in memory or on the disk.
* The input parameter path is a string in UTF-8 encoding.
* The input parameter mode is the same as for fopen.
* Either fp or membuf will be set in the output struct filep.
* The function returns 1 on success, 0 on error. */
int XX_httplib_fopen( const struct mg_connection *conn, const char *path, const char *mode, struct file *filep ) {
struct stat st;
if (!filep) return 0;
/* TODO (high): XX_httplib_fopen should only open a file, while XX_httplib_stat should
* only get the file status. They should not work on different members of
* the same structure (bad cohesion). */
memset(filep, 0, sizeof(*filep));
if (stat(path, &st) == 0) filep->size = (uint64_t)(st.st_size);
if (!XX_httplib_is_file_in_memory(conn, path, filep)) {
#ifdef _WIN32
wchar_t wbuf[PATH_MAX], wmode[20];
XX_httplib_path_to_unicode(conn, path, wbuf, ARRAY_SIZE(wbuf));
MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, ARRAY_SIZE(wmode));
filep->fp = _wfopen(wbuf, wmode);
#else
/* Linux et al already use unicode. No need to convert. */
filep->fp = fopen(path, mode);
#endif
}
return XX_httplib_is_file_opened(filep);
} /* XX_httplib_fopen */
void XX_httplib_fclose( struct file *filep ) {
if (filep != NULL && filep->fp != NULL) fclose(filep->fp);