Merge pull request containers#273 from fboudra/musl-basename

musl: basename: use portable implementation for basename API
alexlarsson · Apr 15, 2024 · 85a693d · 85a693d
2 parents 4776580 + 31afa13
commit 85a693d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/libcomposefs/lcfs-utils.h b/libcomposefs/lcfs-utils.h
@@ -161,4 +161,10 @@ static inline void *steal_pointer(void *pp)
 /* type safety */
 #define steal_pointer(pp) (0 ? (*(pp)) : (steal_pointer)(pp))
 
+static inline const char *gnu_basename(const char *filename)
+{
+	const char *p = strrchr(filename, '/');
+	return p ? p + 1 : filename;
+}
+
 #endif
diff --git a/tools/mkcomposefs.c b/tools/mkcomposefs.c
@@ -1225,7 +1225,7 @@ static int get_cpu_count(void)
 
 static void usage(const char *argv0)
 {
-	const char *bin = basename(argv0);
+	const char *bin = gnu_basename(argv0);
 	fprintf(stderr,
 		"Usage: %s [OPTIONS] SOURCE IMAGE\n"
 		"Options:\n"

diff --git a/tools/mountcomposefs.c b/tools/mountcomposefs.c
@@ -37,10 +37,11 @@
 #include <linux/fsverity.h>
 
 #include "libcomposefs/lcfs-mount.h"
+#include "libcomposefs/lcfs-utils.h"
 
 static void usage(const char *argv0)
 {
-	const char *bin = basename(argv0);
+	const char *bin = gnu_basename(argv0);
 	fprintf(stderr,
 		"usage: %s [-t type] [-o opt[,opts..]] IMAGE MOUNTPOINT\n"
 		"Example:\n"