gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-23 18:45:56 +01:00
Code Issues Projects Releases Wiki Activity

Use -lbsd for strlcat/strlcpy, if needed and available

Browse Source 
On BSD systems, strlcat and strlcpy are included in the C library and
nothing special is needed. On Linux systems they are not, but libbsd may
be available to provide them. Use it if so.

This also adds wstrlcat and wstrlcpy instead of trying to maybe-provide
strlcat and strlcpy themselves, as that way there is no risk of symbol
conflicts. Not bumping the library version at this time, that should be
done (if necessary) before release.

Signed-off-by: Brad Jorsch <anomie@users.sourceforge.net>
This commit is contained in:
Brad Jorsch
2010-09-24 14:37:57 -04:00
committed by Carlos R. Mafra
parent f206c15fea
commit 8ca05fd4be
4 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
WINGs/string.c
View File

@@ -4,6 +4,9 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#ifdef HAVE_BSD_STRING_H
#include <bsd/string.h>
#endif
#include "WUtil.h"
@@ -209,7 +212,13 @@ char *wstrappend(char *dst, char *src)
}
#ifndef HAVE_STRLCAT
#ifdef HAVE_STRLCAT
size_t
wstrlcat(char *dst, const char *src, size_t siz)
{
return strlcat(dst, src, siz);
}
#else
/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
@@ -236,7 +245,7 @@ char *wstrappend(char *dst, char *src)
* If retval >= siz, truncation occurred.
*/
size_t
strlcat(char *dst, const char *src, size_t siz)
wstrlcat(char *dst, const char *src, size_t siz)
{
char *d = dst;
const char *s = src;
@@ -264,7 +273,13 @@ strlcat(char *dst, const char *src, size_t siz)
}
#endif /* HAVE_STRLCAT */
#ifndef HAVE_STRLCPY
#ifdef HAVE_STRLCPY
size_t
wstrlcpy(char *dst, const char *src, size_t siz)
{
return strlcpy(dst, src, siz);
}
#else
/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */
@@ -290,7 +305,7 @@ strlcat(char *dst, const char *src, size_t siz)
* Returns strlen(src); if retval >= siz, truncation occurred.
*/
size_t
strlcpy(char *dst, const char *src, size_t siz)
wstrlcpy(char *dst, const char *src, size_t siz)
{
char *d = dst;
const char *s = src;