Call to basename() relies on a GNU extension to take a const char * vs a char *. Let's define a trivial helper function to ensure compatibility with musl. Fixes Issue: https://github.com/bluez/bluez/issues/843 --- v2: Fix code formatter reported errors v3: Make just node_name as const and keep node_dir as such v4: Fix code formatting errors Makefile.mesh | 2 ++ Makefile.tools | 3 ++- mesh/mesh-config-json.c | 6 ++++-- mesh/rpl.c | 3 ++- src/shared/util.h | 7 +++++++ tools/hex2hcd.c | 3 ++- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile.mesh b/Makefile.mesh index e4c9fa6a3..bebedaf05 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -47,6 +47,8 @@ mesh/main.$(OBJEXT): src/builtin.h lib/bluetooth/bluetooth.h mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c +mesh_bluetooth_meshd_CFLAGS = -I${top_srcdir}/src + if MANPAGES man_MANS += mesh/bluetooth-meshd.8 endif diff --git a/Makefile.tools b/Makefile.tools index 5b9034078..6fc73b8a2 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -328,7 +328,8 @@ tools_l2ping_LDADD = lib/libbluetooth-internal.la tools_bluemoon_SOURCES = tools/bluemoon.c monitor/bt.h tools_bluemoon_LDADD = src/libshared-mainloop.la -tools_hex2hcd_SOURCES = tools/hex2hcd.c +tools_hex2hcd_SOURCES = tools/hex2hcd.c src/shared/util.h +tools_hex2hcd_CFLAGS = -I${top_srcdir}/src tools_mpris_proxy_SOURCES = tools/mpris-proxy.c tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c index c198627c6..85e2adb0e 100644 --- a/mesh/mesh-config-json.c +++ b/mesh/mesh-config-json.c @@ -28,6 +28,7 @@ #include <ell/ell.h> #include <json-c/json.h> +#include "shared/util.h" #include "mesh/mesh-defs.h" #include "mesh/util.h" #include "mesh/mesh-config.h" @@ -2694,7 +2695,8 @@ bool mesh_config_load_nodes(const char *cfgdir_name, mesh_config_node_func_t cb, void mesh_config_destroy_nvm(struct mesh_config *cfg) { - char *node_dir, *node_name; + char *node_dir; + const char *node_name; char uuid[33]; if (!cfg) @@ -2706,7 +2708,7 @@ void mesh_config_destroy_nvm(struct mesh_config *cfg) if (!hex2str(cfg->uuid, 16, uuid, sizeof(uuid))) return; - node_name = basename(node_dir); + node_name = bluez_basename(node_dir); /* Make sure path name of node follows expected guidelines */ if (strcmp(node_name, uuid)) diff --git a/mesh/rpl.c b/mesh/rpl.c index fb225dddd..fb89f0afd 100644 --- a/mesh/rpl.c +++ b/mesh/rpl.c @@ -24,6 +24,7 @@ #include <ell/ell.h> +#include "shared/util.h" #include "mesh/mesh-defs.h" #include "mesh/node.h" @@ -146,7 +147,7 @@ static void get_entries(const char *iv_path, struct l_queue *rpl_list) if (!dir) return; - iv_txt = basename(iv_path); + iv_txt = bluez_basename(iv_path); if (sscanf(iv_txt, "%08x", &iv_index) != 1) { closedir(dir); return; diff --git a/src/shared/util.h b/src/shared/util.h index f2ca4f29f..f55b3a4c3 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -296,3 +296,10 @@ static inline void put_be64(uint64_t val, void *dst) { put_unaligned(cpu_to_be64(val), (uint64_t *) dst); } + +static inline const char *bluez_basename(const char *path) +{ + const char *base = strrchr(path, '/'); + + return base ? base + 1 : path; +} diff --git a/tools/hex2hcd.c b/tools/hex2hcd.c index e6dca5a81..05fa69470 100644 --- a/tools/hex2hcd.c +++ b/tools/hex2hcd.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include <stdbool.h> #include <sys/stat.h> +#include "shared/util.h" static ssize_t process_record(int fd, const char *line, uint16_t *upper_addr) { @@ -302,7 +303,7 @@ static void ver_parse_entry(const char *pathname) } if (S_ISREG(st.st_mode)) { - ver_parse_file(basename(pathname)); + ver_parse_file(bluez_basename(pathname)); goto done; }
