Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new all-in-one strlcpy and wrptr function

This commit is contained in:
Enno Rehling 2015-08-17 19:28:05 +02:00
parent dcececf4fa
commit 1806030baa
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/bsdstring.c
View File

@ -6,6 +6,7 @@
#include <stdarg.h> #include <stdarg.h>
#include "bsdstring.h" #include "bsdstring.h"
#include "log.h"
int wrptr(char **ptr, size_t * size, int result) int wrptr(char **ptr, size_t * size, int result)
{ {
@ -61,6 +62,17 @@ size_t strlcpy(char *dst, const char *src, size_t siz)
} }
#endif #endif
char * strlcpy_w(char *dst, const char *src, size_t *siz, const char *err, const char *file, int line)
{
size_t bytes = strlcpy(dst, src, *siz);
char * buf = dst;
if (wrptr(&buf, siz, bytes) != 0)
log_warning("%s: static buffer too small in %s:%d\n", err, file, line);
return buf;
}
#ifndef HAVE_STRLCAT #ifndef HAVE_STRLCAT
#define HAVE_STRLCAT #define HAVE_STRLCAT
size_t strlcat(char *dst, const char *src, size_t siz) size_t strlcat(char *dst, const char *src, size_t siz)

10
src/util/bsdstring.h
View File

@ -2,22 +2,24 @@
#define UTIL_BSDSTRING_H #define UTIL_BSDSTRING_H
#include <stddef.h> #include <stddef.h>
extern int wrptr(char **ptr, size_t * size, int bytes); int wrptr(char **ptr, size_t * size, int bytes);
#ifndef HAVE_STRLCPY #ifndef HAVE_STRLCPY
extern size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz);
#endif #endif
char * strlcpy_w(char *dst, const char *src, size_t *siz, const char *err, const char *file, int line);
#ifndef HAVE_STRLCAT #ifndef HAVE_STRLCAT
extern size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz);
#endif #endif
#ifndef HAVE_SLPRINTF #ifndef HAVE_SLPRINTF
extern size_t slprintf(char * dst, size_t size, const char * format, ...); size_t slprintf(char * dst, size_t size, const char * format, ...);
#endif #endif
#define WARN_STATIC_BUFFER_EX(foo) log_warning("%s: static buffer too small in %s:%d\n", (foo), __FILE__, __LINE__) #define WARN_STATIC_BUFFER_EX(foo) log_warning("%s: static buffer too small in %s:%d\n", (foo), __FILE__, __LINE__)
#define WARN_STATIC_BUFFER() log_warning("static buffer too small in %s:%d\n", __FILE__, __LINE__) #define WARN_STATIC_BUFFER() log_warning("static buffer too small in %s:%d\n", __FILE__, __LINE__)
#define INFO_STATIC_BUFFER() log_info("static buffer too small in %s:%d\n", __FILE__, __LINE__) #define INFO_STATIC_BUFFER() log_info("static buffer too small in %s:%d\n", __FILE__, __LINE__)
#define STRLCPY(dst, src, siz, err) strlcpy_w((dst), (src), (siz), (err), __FILE__, __LINE__)
#endif #endif