From: Karel Zak <kzak@redhat.com>
Date: Tue, 2 Jul 2024 09:23:13 +0000 (+0200)
Subject: rename: use ul_basename()
X-Git-Tag: v2.42-start~281
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0309a6f5ca018d83420e49e0f9d046fecdb29261;p=thirdparty%2Futil-linux.git

rename: use ul_basename()

Fixes: https://github.com/util-linux/util-linux/issues/3071
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/meson.build b/meson.build
index 883e79ad6..6946cc580 100644
--- a/meson.build
+++ b/meson.build
@@ -3049,6 +3049,7 @@ exe = executable(
   'rename',
   rename_sources,
   include_directories : includes,
+  link_with : [lib_common],
   install_dir : usrbin_exec_dir,
   install : opt,
   build_by_default : opt)
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 7f5695a9e..b99f978e7 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -239,6 +239,7 @@ usrbin_exec_PROGRAMS += rename
 MANPAGES += misc-utils/rename.1
 dist_noinst_DATA += misc-utils/rename.1.adoc
 rename_SOURCES = misc-utils/rename.c
+rename_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_GETOPT
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index 9ab38695f..bb2e3103d 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -28,7 +28,6 @@ for i in $@; do N=`echo "$i" | sed "s/$FROM/$TO/g"`; mv "$i" "$N"; done
 #include <errno.h>
 #include <getopt.h>
 #include <fcntl.h>
-#include <libgen.h>
 #include <unistd.h>
 #include <termios.h>
 #include <sys/types.h>
@@ -40,6 +39,7 @@ for i in $@; do N=`echo "$i" | sed "s/$FROM/$TO/g"`; mv "$i" "$N"; done
 #include "closestream.h"
 #include "optutils.h"
 #include "rpmatch.h"
+#include "fileutils.h"
 
 #define RENAME_EXIT_SOMEOK	2
 #define RENAME_EXIT_NOTHING	4
@@ -59,7 +59,7 @@ static char *find_initial_replace(char *from, char *to, char *orig)
 		/* We only want to search in the final path component. Don't
 		   include the final '/' in that component; if `from` is empty,
 		   we want it to first match after the '/', not before. */
-		search_start = basename(orig);
+		search_start = ul_basename(orig);
 	}
 
 	return strstr(search_start, from);