blob: b7c1839f757fdd010deaa0078a2c57b1550cb762 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From d667b13a87cf3207599a19eb981a893a1d7a67ee Mon Sep 17 00:00:00 2001
From: Brendan Heading <brendanheading@gmail.com>
Date: Mon, 14 Sep 2015 23:25:52 +0100
Subject: [PATCH 1/1] ibrcommon/data/File.cpp: support POSIX basename call
Firstly, and somewhat strangely, musl chooses not to provide a basename(3)
prototype within <string.h> whenever __cplusplus is defined. This can be
solved by including the <libgen.h> header defined by POSIX 1003.1 whenever
__GLIBC__ is not defined.
However, this leads to a second problem. POSIX defines the function as
char* basename(char*) and this is the only version supported by musl.
However, the std::string.cstr() method returns a const char*.
POSIX says that the string parameter can be modified. However the GNU
implementation never modifies it. glibc therefore supports an extension
when compiling under C++ by also supplying
const char* basename(const char*). This extension is not present on musl
which is the cause of the failure.
The solution is reasonably straightforward; test if __GLIBC__ is defined
before calling basename. If not, use the fallback already provided for
other platforms whereby basename() is called on a temporary copy.
Signed-off-by: Brendan Heading <brendanheading@gmail.com>
Upstream-status: pending
---
ibrcommon/data/File.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ibrcommon/data/File.cpp b/ibrcommon/data/File.cpp
index 31af4ae..68e9b4f 100644
--- a/ibrcommon/data/File.cpp
+++ b/ibrcommon/data/File.cpp
@@ -35,7 +35,7 @@
#include <cerrno>
#include <fstream>
-#if !defined(HAVE_FEATURES_H) || defined(ANDROID)
+#if !defined(HAVE_FEATURES_H) || !defined(__GLIBC__) || defined(ANDROID)
#include <libgen.h>
#endif
@@ -225,7 +225,7 @@ namespace ibrcommon
std::string File::getBasename() const
{
-#if !defined(ANDROID) && defined(HAVE_FEATURES_H)
+#if !defined(ANDROID) && defined(HAVE_FEATURES_H) && defined(__GLIBC__)
return std::string(basename(_path.c_str()));
#else
char path[_path.length()+1];
--
2.4.3
|
