mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-06-11 12:14:41 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Replace strnlen with c_strnlen

Browse Source 
PUBLISHED_FROM=815cfaea77171761c952966e98466b87b719de06
This commit is contained in:
Alexander Alashkin 2016-03-19 11:02:09 +01:00 committed by Marko Mikulicic
parent 4ca73566b6
commit e95c074965
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/api_server/Makefile
View File

@ -4,7 +4,7 @@ CFLAGS = -W -Wall $(CFLAGS_EXTRA)
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
CFLAGS += -lws2_32 -D_MG_PROVIDE_STRNLEN CFLAGS += -lws2_32
CC = gcc CC = gcc
else else
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)

2
examples/examples.mk
View File

@ -5,7 +5,7 @@ all: $(PROG)
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
# TODO(alashkin): enable SSL in Windows # TODO(alashkin): enable SSL in Windows
CFLAGS += -lws2_32 -D_MG_PROVIDE_STRNLEN CFLAGS += -lws2_32
CC = gcc CC = gcc
else else
ifeq ($(SSL_LIB),openssl) ifeq ($(SSL_LIB),openssl)

6
mongoose.c
View File

@ -1751,14 +1751,12 @@ void cs_hmac_sha1(const unsigned char *key, size_t keylen,
/* Amalgamated: #include "common/platform.h" */ /* Amalgamated: #include "common/platform.h" */
/* Amalgamated: #include "common/str_util.h" */ /* Amalgamated: #include "common/str_util.h" */
#ifdef _MG_PROVIDE_STRNLEN size_t c_strnlen(const char *s, size_t maxlen) {
size_t strnlen(const char *s, size_t maxlen) {
size_t l = 0; size_t l = 0;
for (; l < maxlen && s[l] != '\0'; l++) { for (; l < maxlen && s[l] != '\0'; l++) {
} }
return l; return l;
} }
#endif
#define C_SNPRINTF_APPEND_CHAR(ch) \ #define C_SNPRINTF_APPEND_CHAR(ch) \
do { \ do { \
@ -1887,7 +1885,7 @@ int c_vsnprintf(char *buf, size_t buf_size, const char *fmt, va_list ap) {
if (ch == 's') { if (ch == 's') {
const char *s = va_arg(ap, const char *); /* Always fetch parameter */ const char *s = va_arg(ap, const char *); /* Always fetch parameter */
int j; int j;
int pad = field_width - (precision >= 0 ? strnlen(s, precision) : 0); int pad = field_width - (precision >= 0 ? c_strnlen(s, precision) : 0);
for (j = 0; j < pad; j++) { for (j = 0; j < pad; j++) {
C_SNPRINTF_APPEND_CHAR(' '); C_SNPRINTF_APPEND_CHAR(' ');
} }

10
mongoose.h
View File

@ -857,6 +857,7 @@ int cs_base64_decode(const unsigned char *s, int len, char *dst);
extern "C" { extern "C" {
#endif #endif
size_t c_strnlen(const char *s, size_t maxlen);
int c_snprintf(char *buf, size_t buf_size, const char *format, ...); int c_snprintf(char *buf, size_t buf_size, const char *format, ...);
int c_vsnprintf(char *buf, size_t buf_size, const char *format, va_list ap); int c_vsnprintf(char *buf, size_t buf_size, const char *format, va_list ap);
/* /*
@ -865,15 +866,6 @@ int c_vsnprintf(char *buf, size_t buf_size, const char *format, va_list ap);
*/ */
const char *c_strnstr(const char *s, const char *find, size_t slen); const char *c_strnstr(const char *s, const char *find, size_t slen);
#if (!(defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 700) && \
!(defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200809L) && \
!(defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200809L) && \
!defined(RTOS_SDK)) && \
!(defined(_MSC_VER) && _MSC_VER >= 1600 /* MSVC2010+ has strnlen */)
#define _MG_PROVIDE_STRNLEN
size_t strnlen(const char *s, size_t maxlen);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif