summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-05-15 11:05:51 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-05-15 11:10:12 (GMT)
commitfe16aedd32137828fb0ab9cdd68ef043e17c59ee (patch)
treea78c8b03456249c034fddf9a0fe75f2fc89bd309
parent9834a247d37a24c066973daaa902dd539f7e1ee7 (diff)
downloadDoxygen-fe16aedd32137828fb0ab9cdd68ef043e17c59ee.zip
Doxygen-fe16aedd32137828fb0ab9cdd68ef043e17c59ee.tar.gz
Doxygen-fe16aedd32137828fb0ab9cdd68ef043e17c59ee.tar.bz2
Fix build issue: strlcpy & strlcat are BSD specific
-rw-r--r--libversion/fullversion.cpp8
-rw-r--r--libversion/gitversion.cpp.in4
-rw-r--r--src/CMakeLists.txt2
3 files changed, 7 insertions, 7 deletions
diff --git a/libversion/fullversion.cpp b/libversion/fullversion.cpp
index dfc2b0d..e0a779f 100644
--- a/libversion/fullversion.cpp
+++ b/libversion/fullversion.cpp
@@ -8,12 +8,12 @@ const char *getFullVersion(void)
static bool init = false;
if (!init)
{
- strlcpy(fullVersionString,getDoxygenVersion(),BUF_SIZE);
+ strncpy(fullVersionString,getDoxygenVersion(),BUF_SIZE-1);
if (strlen(getGitVersion())>0)
{
- strlcat(fullVersionString," (",BUF_SIZE);
- strlcat(fullVersionString,getGitVersion(),BUF_SIZE);
- strlcat(fullVersionString,")",BUF_SIZE);
+ strncat(fullVersionString," (",BUF_SIZE-1);
+ strncat(fullVersionString,getGitVersion(),BUF_SIZE-1);
+ strncat(fullVersionString,")",BUF_SIZE-1);
}
fullVersionString[BUF_SIZE-1]='\0';
init = true;
diff --git a/libversion/gitversion.cpp.in b/libversion/gitversion.cpp.in
index 50ce1d2..242dd59 100644
--- a/libversion/gitversion.cpp.in
+++ b/libversion/gitversion.cpp.in
@@ -13,8 +13,8 @@ const char *getGitVersion(void)
static bool init = false;
if (!init)
{
- strncpy(gitVersionString,"@GIT_HEAD_SHA1@",BUF_SIZE);
- strncat(gitVersionString,!strcmp("@GIT_IS_DIRTY@","true")?"*":"",BUF_SIZE);
+ strncpy(gitVersionString,"@GIT_HEAD_SHA1@",BUF_SIZE-1);
+ strncat(gitVersionString,!strcmp("@GIT_IS_DIRTY@","true")?"*":"",BUF_SIZE-1);
if (!strcmp("@GIT_HEAD_SHA1@", "GIT-NOTFOUND")) gitVersionString[0] = '\0';
gitVersionString[BUF_SIZE-1]='\0';
init = true;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 154abb0..fec251e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -315,8 +315,8 @@ if (use_libclang)
endif()
target_link_libraries(doxygen
- doxycfg
doxymain
+ doxycfg
qtools
md5
lodepng