Skip to contentSkip to conversation

src/log.c: Include libgen.h for basename API

PATCH Superseded Khem Raj 2 participants 2 messages Jan 2, 2024 – Jan 15, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 src/log.c: Include libgen.h for basename API

Use POSIX version of basename. This comes to front with latest musl which dropped the declaration from string.h [1] it fails to build with clang-17+ because it treats implicit function declaration as error.

Fix it by applying the basename on a copy of string since posix version may modify the input string.

[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7

---
 src/log.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
src/log.c +4 -2
index 554b046..941e078 100644
@@ -24,6 +24,7 @@
 #endif
 
 #include <stdio.h>
+#include <libgen.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -196,6 +197,7 @@ int __connman_log_init(const char *program, const char *debug,
 		const char *program_name, const char *program_version)
 {
 	static char path[PATH_MAX];
+  char* tmp = strdup(program);
 	int option = LOG_NDELAY | LOG_PID;
 
 	program_exec = program;
@@ -212,8 +214,8 @@ int __connman_log_init(const char *program, const char *debug,
 	if (backtrace)
 		signal_setup(signal_handler);
 
-	openlog(basename(program), option, LOG_DAEMON);
-
+	openlog(basename(tmp), option, LOG_DAEMON);
+  free(tmp);
 	syslog(LOG_INFO, "%s version %s", program_name, program_version);
 
 	return 0;
Signature · 1 line
2.43.0
#1 lore raw

Hi Khem,

Quoted 35 lines

Use POSIX version of basename. This comes to front with latest musl which dropped the declaration from string.h [1] it fails to build with clang-17+ because it treats implicit function declaration as error.

Fix it by applying the basename on a copy of string since posix version may modify the input string.

[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7

---
src/log.c | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)
src/log.c +2 -0
index 554b046..941e078 100644
@@ -24,6 +24,7 @@
 #endif
 
 #include <stdio.h>
+#include <libgen.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -196,6 +197,7 @@ int __connman_log_init(const char *program, const char *debug,
 const char *program_name, const char *program_version)
 {
 static char path[PATH_MAX];
+  char* tmp = strdup(program);
 int option = LOG_NDELAY | LOG_PID;
 
 program_exec = program;

src/log.c int __connman_log_init(const char *program, const char *debug, · line 218

Quoted 7 lines
src/log.c +2 -2
@@ -212,8 +214,8 @@ int __connman_log_init(const char *program, const char *debug,
 if (backtrace)
 signal_setup(signal_handler);
 
- openlog(basename(program), option, LOG_DAEMON);
-
+ openlog(basename(tmp), option, LOG_DAEMON);
+  free(tmp);

can you please follow the coding style.

Regards

Marcel