Skip to content

Commit

Permalink
Define strlcpy only on platforms where it's not available
Browse files Browse the repository at this point in the history
Linux musl-libc and recent glibc > 2.38 have it.

Signed-off-by: David Heidelberg <[email protected]>
  • Loading branch information
okias authored and sfan5 committed Jan 19, 2024
1 parent e416c99 commit 225aa10
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 15 deletions.
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ endif()
include(CheckCSourceCompiles)
include(CheckSymbolExists)

check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)

set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR})
if(USE_LUAJIT)
set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARY})
Expand Down
1 change: 1 addition & 0 deletions src/cmake_config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#cmakedefine01 USE_SYSTEM_JSONCPP
#cmakedefine01 USE_REDIS
#cmakedefine01 HAVE_ENDIAN_H
#cmakedefine01 HAVE_STRLCPY
#cmakedefine01 CURSES_HAVE_CURSES_H
#cmakedefine01 CURSES_HAVE_NCURSES_H
#cmakedefine01 CURSES_HAVE_NCURSES_NCURSES_H
Expand Down
17 changes: 2 additions & 15 deletions src/porting.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

// Be mindful of what you include here!
#include <string>
#include "config.h"
#include "irrlichttypes.h" // u64
#include "debug.h"
#include "constants.h"
Expand Down Expand Up @@ -70,21 +71,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define strtok_r(x, y, z) mystrtok_r(x, y, z)
#endif

// strlcpy is missing from glibc. thanks a lot, drepper.
// strlcpy is also missing from AIX and HP-UX because they aim to be weird.
// We can't simply alias strlcpy to MSVC's strcpy_s, since strcpy_s by
// default raises an assertion error and aborts the program if the buffer is
// too small.
#if defined(__FreeBSD__) || defined(__NetBSD__) || \
defined(__OpenBSD__) || defined(__DragonFly__) || \
defined(__APPLE__) || \
defined(__sun) || defined(sun) || \
defined(__QNX__) || defined(__QNXNTO__)
#define HAVE_STRLCPY
#endif

// So we need to define our own.
#ifndef HAVE_STRLCPY
#if !HAVE_STRLCPY
#define strlcpy(d, s, n) mystrlcpy(d, s, n)
#endif

Expand Down

0 comments on commit 225aa10

Please sign in to comment.