From: dongshengyuan <545258830@qq.com>
Date: Thu, 11 Jun 2026 05:22:04 +0000 (+0800)
Subject: fsck: refactor is_irrotational_disk() to use ul_path_readf_s32()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90be16bf196ce70c30922861c407404c2d44770;p=thirdparty%2Futil-linux.git

fsck: refactor is_irrotational_disk() to use ul_path_readf_s32()

Replace the open-coded snprintf + fopen + fscanf + fclose pattern
with ul_new_path() + ul_path_readf_s32() + ul_unref_path() from lib/path.c.

Suggested-by: Karel Zak <kzak@redhat.com>
Signed-off-by: dongshengyuan <dongshengyuan@uniontech.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
---

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index aca06c0dd..cf9c8e420 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -53,6 +53,7 @@
 #include <libmount.h>
 
 #include "nls.h"
+#include "path.h"
 #include "pathnames.h"
 #include "exitcodes.h"
 #include "c.h"
@@ -313,32 +314,20 @@ static void fs_set_done(struct libmnt_fs *fs)
 
 static int is_irrotational_disk(dev_t disk)
 {
-	char path[PATH_MAX];
-	FILE *f;
-	int rc, x;
+	struct path_cxt *pc;
+	int32_t x = 0;
+	int rc = 0;
 
-
-	rc = snprintf(path, sizeof(path),
-			"/sys/dev/block/%u:%u/queue/rotational",
-			major(disk), minor(disk));
-
-	if (rc < 0 || (unsigned int) rc >= sizeof(path))
-		return 0;
-
-	f = fopen(path, "r");
-	if (!f)
+	pc = ul_new_path("/sys/dev/block");
+	if (!pc)
 		return 0;
 
-	rc = fscanf(f, "%d", &x);
-	if (rc != 1) {
-		if (ferror(f))
-			warn(_("cannot read %s"), path);
-		else
-			warnx(_("parse error: %s"), path);
-	}
-	fclose(f);
+	rc = ul_path_readf_s32(pc, &x,
+			"%u:%u/queue/rotational",
+			major(disk), minor(disk)) == 0 && x == 0;
 
-	return rc == 1 ? !x : 0;
+	ul_unref_path(pc);
+	return rc;
 }
 
 static void lock_disk(struct fsck_instance *inst)