Provide GNU basename compatible implementation
PATCH v6 1/1 Provide GNU basename compatible implementation
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
v5: Redo the patch to address textrels seen on ppc32/arm
v6: Fix checkpatch.pl errors/warnings
configure.ac | 11 ++++++++++- mesh/mesh-config-json.c | 4 +++- mesh/missing.h | 21 +++++++++++++++++++++ mesh/rpl.c | 1 + tools/hex2hcd.c | 1 + tools/missing.h | 21 +++++++++++++++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 mesh/missing.h create mode 100644 tools/missing.h
configure.ac +10 -1
@@ -70,7 +70,16 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) -AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) +AC_CHECK_HEADERS(string.h linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) + +# basename may be only available in libgen.h with the POSIX behavior, +# not desired here +AC_CHECK_DECLS([basename], [], + AC_MSG_WARN([GNU basename extension not found]), + [#define _GNU_SOURCE 1 + #include <string.h> + ]) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28)
mesh/mesh-config-json.c +3 -1
@@ -28,6 +28,7 @@#include <ell/ell.h> #include <json-c/json.h> +#include "mesh/missing.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)
mesh/missing.h new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* +* +* BlueZ - Bluetooth protocol stack for Linux +* +* Copyright (C) 2024 Khem Raj <[email protected]> +* +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#if !HAVE_DECL_BASENAME +#include <string.h> +static inline const char *basename (const char *path) +{ +const char *base =strrchr (path,'/' ); + +return base ? base +1 : path; +} +#endif
mesh/rpl.c +1 -0
@@ -24,6 +24,7 @@#include <ell/ell.h> +#include "mesh/missing.h" #include "mesh/mesh-defs.h" #include "mesh/node.h"
tools/hex2hcd.c +1 -0
@@ -24,6 +24,7 @@#include <stdlib.h> #include <stdbool.h> #include <sys/stat.h> +#include "tools/missing.h" static ssize_t process_record (int fd,const char *line,uint16_t *upper_addr) {
tools/missing.h new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* +* +* BlueZ - Bluetooth protocol stack for Linux +* +* Copyright (C) 2024 Khem Raj <[email protected]> +* +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif +#if !HAVE_DECL_BASENAME +#include <string.h> +static inline const char *basename (const char *path) +{ +const char *base =strrchr (path,'/' ); + +return base ? base +1 : path; +} +#endif
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=884094
---Test result---
Test Summary:
CheckPatch PASS 0.27 seconds GitLint PASS 0.18 seconds BuildEll PASS 24.43 seconds BluezMake PASS 1670.47 seconds MakeCheck PASS 13.81 seconds MakeDistcheck FAIL 68.03 seconds CheckValgrind PASS 252.55 seconds CheckSmatch WARNING 356.66 seconds bluezmakeextell PASS 119.91 seconds IncrementalBuild PASS 1469.35 seconds ScanBuild PASS 1011.25 seconds
Details
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:
Package cups was not found in the pkg-config search path.
Perhaps you should add the directory containing `cups.pc'
to the PKG_CONFIG_PATH environment variable
No package 'cups' found../../mesh/mesh-config-json.c:31:10: fatal error: mesh/missing.h: No such file or directory
31 | #include "mesh/missing.h"
| ^~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [Makefile:7850: mesh/mesh-config-json.o] Error 1 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:4676: all] Error 2
make: *** [Makefile:12226: distcheck] Error 1
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:tools/hex2hcd.c:136:26: warning: Variable length array is used.
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Tue, 27 Aug 2024 23:09:26 -0700 you wrote:
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
[...]
Here is the summary with links:
- [v6,BlueZ] Provide GNU basename compatible implementation
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=690eccbe8562
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html