generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-08 11:02:24 +01:00
Code Issues Projects Releases Wiki Activity

Adjust strlcpy() and strlcat() per glibc adoption

Browse Source 
These functions were added in glibc 2.38, in anticipation of POSIX
adopting them too.

Closes: #26
This commit is contained in:
Guillem Jover 2024-01-07 17:43:12 +01:00
parent ecb44e1655
commit df116b5597
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -267,6 +267,11 @@ need_id_from_name=yes
need_fpurge=yes need_fpurge=yes
need_funopen=yes need_funopen=yes
AS_CASE([$host_os], AS_CASE([$host_os],
[*-gnu*], [
# On glibc >= 2.38, strlcpy() and strlcat() got added,
# so these could then be dropped on the next SOVERSION bump.
#need_strl=no
],
[*-musl*], [ [*-musl*], [
# On musl >= 0.5.0, strlcpy() and strlcat() were already implemented, # On musl >= 0.5.0, strlcpy() and strlcat() were already implemented,
# so these can then be dropped on the next SOVERSION bump. # so these can then be dropped on the next SOVERSION bump.

3
include/bsd/string.h
View File

@ -41,7 +41,8 @@
#include <sys/types.h> #include <sys/types.h>
__BEGIN_DECLS __BEGIN_DECLS
#ifndef __APPLE__ #if !defined(__APPLE__) && \
(!defined(__GLIBC__) || !__GLIBC_PREREQ(2, 38) || !defined(_DEFAULT_SOURCE))
size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz);
size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz);
#endif #endif

7
man/strlcpy.3bsd
View File

@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: May 31 2007 $ .Dd $Mdocdate: January 7 2024 $
.Dt strlcpy 3bsd .Dt strlcpy 3bsd
.Os .Os
.Sh NAME .Sh NAME
@ -192,6 +192,7 @@ and
functions first appeared in functions first appeared in
.Ox 2.4 , .Ox 2.4 ,
and made their appearance in and made their appearance in
.Nx 1.4.3 .Nx 1.4.3 ,
.Fx 3.3
and and
.Fx 3.3 . glibc 2.38.