Skip to contentSkip to conversation

bpftool: Be more portable by using POSIX's basename()

PATCH In review Arnaldo Carvalho de Melo 2 participants 2 messages Jan 29, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpftool: Be more portable by using POSIX's basename()

musl libc had the basename() prototype in string.h, but this is a glibc-ism, now they removed the _GNU_SOURCE bits in their devel distro, Alpine Linux edge:

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

So lets use the POSIX version, the whole rationale is spelled out at:

https://gitlab.alpinelinux.org/alpine/aports/-/issues/15643

---
 tools/bpf/bpftool/gen.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
tools/bpf/bpftool/gen.c +5 -3
index ee3ce2b8000d75d2..a5cc5938c3d7951e 100644
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <linux/err.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -56,9 +57,10 @@ static bool str_has_suffix(const char *str, const char *suffix)
 
 static void get_obj_name(char *name, const char *file)
 {
-	/* Using basename() GNU version which doesn't modify arg. */
-	strncpy(name, basename(file), MAX_OBJ_NAME_LEN - 1);
-	name[MAX_OBJ_NAME_LEN - 1] = '\0';
+	char file_copy[PATH_MAX];
+	/* Using basename() POSIX version to be more portable. */
+	strncpy(file_copy, file, PATH_MAX - 1)[PATH_MAX - 1] = '\0';
+	strncpy(name, basename(file_copy), MAX_OBJ_NAME_LEN - 1)[MAX_OBJ_NAME_LEN - 1] = '\0';
 	if (str_has_suffix(name, ".o"))
 		name[strlen(name) - 2] = '\0';
 	sanitize_identifier(name);
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 35 lines · Arnaldo Carvalho de Melo

musl libc had the basename() prototype in string.h, but this is a glibc-ism, now they removed the _GNU_SOURCE bits in their devel distro, Alpine Linux edge:

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

So lets use the POSIX version, the whole rationale is spelled out at:

   https://gitlab.alpinelinux.org/alpine/aports/-/issues/15643
---
  tools/bpf/bpftool/gen.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
tools/bpf/bpftool/gen.c +1 -0
index ee3ce2b8000d75d2..a5cc5938c3d7951e 100644
@@ -7,6 +7,7 @@
  #include <ctype.h>
  #include <errno.h>
  #include <fcntl.h>
+#include <libgen.h>
  #include <linux/err.h>
  #include <stdbool.h>
  #include <stdio.h>

tools/bpf/bpftool/gen.c static bool str_has_suffix(const char *str, const char *suffix) · line 60

Quoted 7 lines
tools/bpf/bpftool/gen.c +1 -3
@@ -56,9 +57,10 @@ static bool str_has_suffix(const char *str, const char *suffix)
 
  static void get_obj_name(char *name, const char *file)
  {
-	/* Using basename() GNU version which doesn't modify arg. */
-	strncpy(name, basename(file), MAX_OBJ_NAME_LEN - 1);
-	name[MAX_OBJ_NAME_LEN - 1] = '\0';
+	char file_copy[PATH_MAX];

Added a newline in here while applying, otherwise lgtm, thanks!

Quoted 7 lines
tools/bpf/bpftool/gen.c +3 -0
+	/* Using basename() POSIX version to be more portable. */
+	strncpy(file_copy, file, PATH_MAX - 1)[PATH_MAX - 1] = '\0';
+	strncpy(name, basename(file_copy), MAX_OBJ_NAME_LEN - 1)[MAX_OBJ_NAME_LEN - 1] = '\0';
  	if (str_has_suffix(name, ".o"))
  		name[strlen(name) - 2] = '\0';
  	sanitize_identifier(name);