From: Masatake YAMATO <yamato@redhat.com>
Date: Mon, 13 May 2024 16:43:42 +0000 (+0900)
Subject: lsfd: (refactor) use ul_path_statf and ul_path_readlinkf
X-Git-Tag: v2.42-start~341^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3036e4c213b500a90c2531ff8fec76e5979184d0;p=thirdparty%2Futil-linux.git

lsfd: (refactor) use ul_path_statf and ul_path_readlinkf

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/lsfd-cmd/file.c b/lsfd-cmd/file.c
index 02db8da5e..b4629fdc3 100644
--- a/lsfd-cmd/file.c
+++ b/lsfd-cmd/file.c
@@ -591,7 +591,6 @@ static unsigned long get_minor_for_sysvipc(void)
 
 	pid_t self = getpid();
 	struct path_cxt *pc = NULL;
-	char map_file[sizeof("map_files/0000000000000000-ffffffffffffffff")];
 
 	struct stat sb;
 	unsigned long m = 0;
@@ -613,9 +612,8 @@ static unsigned long get_minor_for_sysvipc(void)
 	if (procfs_process_init_path(pc, self) != 0)
 		goto out;
 
-	snprintf(map_file, sizeof(map_file),
-		 "map_files/%lx-%lx", (long)start, (long)start + pagesize);
-	if (ul_path_stat(pc, &sb, 0, map_file) < 0)
+	if (ul_path_statf(pc, &sb, 0, "map_files/%lx-%lx",
+			  (long)start, (long)start + pagesize) < 0)
 		goto out;
 
 	m = minor(sb.st_dev);
diff --git a/lsfd-cmd/lsfd.c b/lsfd-cmd/lsfd.c
index cf52c4aae..6c99dcd4b 100644
--- a/lsfd-cmd/lsfd.c
+++ b/lsfd-cmd/lsfd.c
@@ -968,14 +968,14 @@ static void parse_maps_line(struct path_cxt *pc, char *buf, struct proc *proc)
 		f = new_file(proc, stat2class(&sb), &sb, path, -assoc);
 	} else {
 		/* As used in tcpdump, AF_PACKET socket can be mmap'ed. */
-		char map_file[sizeof("map_files/0000000000000000-ffffffffffffffff")];
 		char sym[PATH_MAX] = { '\0' };
 
 	try_map_files:
-		snprintf(map_file, sizeof(map_file), "map_files/%"PRIx64"-%"PRIx64, start, end);
-		if (ul_path_readlink(pc, sym, sizeof(sym), map_file) < 0)
+		if (ul_path_readlinkf(pc, sym, sizeof(sym),
+				      "map_files/%"PRIx64"-%"PRIx64, start, end) < 0)
 			f = new_readlink_error_file(proc, errno, -assoc);
-		else if (ul_path_stat(pc, &sb, 0, map_file) < 0)
+		else if (ul_path_statf(pc, &sb, 0,
+				       "map_files/%"PRIx64"-%"PRIx64, start, end) < 0)
 			f = new_stat_error_file(proc, sym, errno, -assoc);
 		else
 			f = new_file(proc, stat2class(&sb), &sb, sym, -assoc);