From b47b3e8df043f00c363efee6dcffd582df451f94 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Sun, 15 Sep 2019 05:21:37 +0900 Subject: [PATCH] sbin/fsck_msdosfs: Bring in freebsd/freebsd@39c1449b (fix prompts) --- sbin/fsck_msdosfs/boot.c | 4 ++-- sbin/fsck_msdosfs/fat.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c index aae40b0810..7781bb77df 100644 --- a/sbin/fsck_msdosfs/boot.c +++ b/sbin/fsck_msdosfs/boot.c @@ -109,8 +109,8 @@ readboot(int dosfs, struct bootblock *boot) || fsinfo[0x3fd] || fsinfo[0x3fe] != 0x55 || fsinfo[0x3ff] != 0xaa) { - pwarn("Invalid signature in fsinfo block"); - if (ask(0, "fix")) { + pwarn("Invalid signature in fsinfo block\n"); + if (ask(0, "Fix")) { memcpy(fsinfo, "RRaA", 4); memcpy(fsinfo + 0x1e4, "rrAa", 4); fsinfo[0x1fc] = fsinfo[0x1fd] = 0; diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 9f92cebe0c..693cf845a9 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -250,9 +250,9 @@ clustdiffer(cl_t cl, cl_t *cp1, cl_t *cp2, u_int fatnum) if ((*cp1 != CLUST_FREE && *cp1 < CLUST_BAD && *cp2 != CLUST_FREE && *cp2 < CLUST_BAD) || (*cp1 > CLUST_BAD && *cp2 > CLUST_BAD)) { - pwarn("Cluster %u is marked %s with different indicators, ", + pwarn("Cluster %u is marked %s with different indicators\n", cl, rsrvdcltype(*cp1)); - if (ask(1, "fix")) { + if (ask(1, "Fix")) { *cp2 = *cp1; return FSFATMOD; } @@ -591,7 +591,7 @@ checklost(int dosfs, struct bootblock *boot, struct fatEntry *fat) if (boot->FSFree != boot->NumFree) { pwarn("Free space in FSInfo block (%d) not correct (%d)\n", boot->FSFree, boot->NumFree); - if (ask(1, "fix")) { + if (ask(1, "Fix")) { boot->FSFree = boot->NumFree; ret = 1; } -- 2.41.0