From 1e6844737ec5d3f98d05e4ad31817ae66d523b24 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 13 Feb 2023 02:07:31 -0600
Subject: [PATCH] Add blkid iso test file and tweak iso output fields.

Note: TEST_HOST outputs iso fields in unique order, which we don't.
But there's incoming version skew with new versions there anyway...
---
 tests/blkid.test          |   2 +-
 tests/files/blkid/iso.bz2 | Bin 0 -> 367 bytes
 toys/other/blkid.c        |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 tests/files/blkid/iso.bz2

diff --git a/tests/blkid.test b/tests/blkid.test
index 4c385dcb..bcd38f3d 100755
--- a/tests/blkid.test
+++ b/tests/blkid.test
@@ -29,7 +29,7 @@ testing "f2fs" "BLKID f2fs" \
   'temp.img: LABEL="myf2fs" UUID="b53d3619-c204-4c0b-8504-36363578491c" TYPE="f2fs"\n' \
   "" ""
 testing "iso" "BLKID iso" \
-  'temp.img: SEC_TYPE="msdos" LABEL="MYISO" UUID="1970-01-02-12-55-42-00" TYPE="iso9660"\n' \
+  'temp.img: LABEL="CDROM" UUID="2023-02-08-04-47-27-00" TYPE="iso9660"\n' \
   "" ""
 testing "msdos" "BLKID msdos" \
   'temp.img: SEC_TYPE="msdos" LABEL="mymsdos" UUID="6E1E-0851" TYPE="vfat"\n' \
diff --git a/tests/files/blkid/iso.bz2 b/tests/files/blkid/iso.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..f6babd506d61d66be0c861f03d83716f39e48f8c
GIT binary patch
literal 367
zcmV-#0g(PeT4*^jL0KkKSu`DHBLD!YfBE-R3dB)o{pdgc-(Uhngbn}*1ONa4kN^M#
z00^)FINLy!NXTksKT;c0(r5!gpdO}!)X}um(Wj_JN=AUt4Ky?W0j7f>0B8a!OqB9y
zG=_ix007Vc8Z>4!Sygvi*)qxu76jr-;elOPK`yWWFYE%S1(!0`3Idj~P{N1`P8A`B
zi*YndPADQVMJ$6*ArVnDAi++Il5)Ki%oLcT1|mctN<<;EJcbBVLY|gQ%2k;aN-`Bx
zsHH>J+T$8DLqT6T@i(4T&GL7>3>`|u&Qlmm?rjj>^Ny%CDlf7vdS12}J+NUjZe*C;
zan{Mk-<dW{(kYju(+$D7#lEI_WOP+sz?{~wv4gcpLJiFAJshL(U1;fvZdp3+)T6Sp
zigq$87NZj4+t>E_v@2>MNhIX&eRNAEx$)133#I+PXYrEEV8uNwVcMvopn@U@MwkDK
Nxgwk>NE!~a5r7fBoG<_Y

literal 0
HcmV?d00001

diff --git a/toys/other/blkid.c b/toys/other/blkid.c
index 726ae754..bed20b2c 100644
--- a/toys/other/blkid.c
+++ b/toys/other/blkid.c
@@ -168,7 +168,7 @@ 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")) {
-      show_tag("SEC_TYPE", "msdos");
+      if (*type=='v') show_tag("SEC_TYPE", "msdos");
       while (len && s[len-1]==' ') len--;
       if (strstart(&s, "NO NAME")) len=0;
     }
-- 
2.39.2