From 2045c952145e4628d0ae2011f80e7b33974cea60 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Fri, 8 Nov 2024 16:12:18 -0600
Subject: [PATCH] Kana provided the file, and clarified the ==4 check excludes
 fat16.

---
 tests/blkid.test            |   6 +++---
 tests/files/blkid/fat32.bz2 | Bin 0 -> 393 bytes
 toys/other/blkid.c          |   3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 tests/files/blkid/fat32.bz2

diff --git a/tests/blkid.test b/tests/blkid.test
index c370d657..420a03b2 100755
--- a/tests/blkid.test
+++ b/tests/blkid.test
@@ -45,9 +45,9 @@ testing "squashfs" "BLKID squashfs" 'temp.img: TYPE="squashfs"\n' "" ""
 testing "vfat" "BLKID vfat" \
   'temp.img: SEC_TYPE="msdos" LABEL="myvfat" UUID="7356-B91D" TYPE="vfat"\n' \
   "" ""
-#testing "fat32" "BLKID fat32" \
-#  'temp.img: LABEL="myfat32" UUID="B25B-2ECB" TYPE="vfat"\n' \
-#  "" ""
+testing "fat32" "BLKID fat32" \
+  'temp.img: LABEL="myfat32" UUID="2E7D-E046" TYPE="vfat"\n' \
+  "" ""
 testing "xfs" "BLKID xfs" \
   'temp.img: LABEL="XFS_test" UUID="d63a1dc3-27d5-4dd4-8b38-f4f97f495c6f" TYPE="xfs"\n' \
   "" ""
diff --git a/tests/files/blkid/fat32.bz2 b/tests/files/blkid/fat32.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..81eebc7db04060df2ac31ebb6f21979899b0c93f
GIT binary patch
literal 393
zcmV;40e1dET4*^jL0KkKSt-aylK>$xfB*mc!648j7yuyvS7ATz+^#?XKmq_11PQ=`
zfC5AaKuNFxm;fAP$)SkE(SSw*VE|wznl#AJ3~`eth9eV30T>B{0f3rl(<4AIRT3!l
z2xw|)wLMJ%paVvaQKp7!Y3ZnDntG<D6xO(v5nRN~FeWl31arzE8;J-?LMbQ^hYXPj
zffHiLN@5WJHd7GPn2PYs&>#i`x7><DX;Or9CW%GVgaEvgZ7~j(brHT^Tzl21&a{kb
z-{hp=VOVgak1{CbRIz}}bGXc?qNJtyXjvDZgs&`TaU-?!Y@04OLj#R{=w*7=ye((J
zYcf4b%Z;Lp$uct|18}Uvz@wnXl(8~0JO;X@)`t>V6*ZWW^slJS=sBCO>vta8rLerB
zjBCenyz`@xp^Yt0`s)(`xY%D**HqHLzNn$JX;#=>TyGtniPG(U-EQ-!)YAI8n4N12
nU1~;GD&0M;Os=P4cHeEaApjcf1ZpIb!~QPhig2MIQ;>}&rGBx_

literal 0
HcmV?d00001

diff --git a/toys/other/blkid.c b/toys/other/blkid.c
index 41229796..5a5726e9 100644
--- a/toys/other/blkid.c
+++ b/toys/other/blkid.c
@@ -168,7 +168,8 @@ static void do_blkid(int fd, char *name)
   if (!FLAG(U) && len) {
     s = toybuf+fstypes[i].label_off-off;
     if (!strcmp(type, "vfat") || !strcmp(type, "iso9660")) {
-      if (*type=='v' && !FLAG(U)) show_tag("SEC_TYPE", "msdos");
+      if (*type=='v' && fstypes[i].magic_len==4 && !FLAG(L))
+        show_tag("SEC_TYPE", "msdos");
       while (len && s[len-1]==' ') len--;
       if (strstart(&s, "NO NAME")) len=0;
     }
-- 
2.39.5