Use basename (3) for the %basename macro

ffesti · Mar 7, 2024 · eb2d628 · eb2d628
1 parent 77d02b7
commit eb2d628
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/rpmio/macro.c b/rpmio/macro.c
@@ -1301,10 +1301,7 @@ static void doFoo(rpmMacroBuf mb, rpmMacroEntry me, ARGV_t argv, size_t *parsed)
 
     if (rstreq("basename", me->name)) {
 	buf = xstrdup(argv[1]);
-	if ((b = strrchr(buf, '/')) == NULL)
-	    b = buf;
-	else
-	    b++;
+	b = basename(buf);
     } else if (rstreq("dirname", me->name)) {
 	buf = xstrdup(argv[1]);
 	b = dirname(buf);

diff --git a/tests/rpmmacro.at b/tests/rpmmacro.at
@@ -373,6 +373,11 @@ runroot rpm --eval "%dirname /foo"
 runroot rpm --eval "%dirname /foo/"
 runroot rpm --eval "%dirname /foo/foobar"
 runroot rpm --eval "%dirname /foo/foobar/"
+runroot rpm --eval "%basename /foo/foobar"
+runroot rpm --eval "%basename /foo/foobar/"
+runroot rpm --eval "%basename /"
+runroot rpm --eval "%basename foobar/"
+runroot rpm --eval "%basename foobar"
 runroot rpm --define '%xxx /hello/%%%%/world' --eval '%{dirname:%xxx}'
 runroot rpm --eval "%{uncompress}"
 runroot rpm --eval "%{uncompress:}"
@@ -403,6 +408,11 @@ runroot rpm --eval "%verbose foo"
 /
 /foo
 /foo
+foobar
+foobar
+/
+foobar
+foobar
 /hello/%%
 
 bar