From a4045c21a30ddf36528b0b1fc0cc6e4fffb33ce6 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 9 Feb 2008 23:12:56 -0500 Subject: [PATCH] blkid: Add support for returning labels for UDF filesystems Addresses-Sourceforge-Bug: #1886394 Signed-off-by: "Theodore Ts'o" --- lib/blkid/probe.c | 2 +- lib/blkid/tests/udf.img.bz2 | Bin 0 -> 2031 bytes lib/blkid/tests/udf.results | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 lib/blkid/tests/udf.img.bz2 create mode 100644 lib/blkid/tests/udf.results diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 917447b..00cf850 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -905,7 +905,7 @@ static int probe_udf(struct blkid_probe *probe, NSR02 for UDF 1.50 NSR03 for UDF 2.00 */ if (!memcmp(isosb->vd_id, "NSR0", 4)) - return 0; + return probe_iso9660(probe, id, buf); for (m = udf_magic; *m; m++) if (!memcmp(*m, isosb->vd_id, 5)) break; diff --git a/lib/blkid/tests/udf.img.bz2 b/lib/blkid/tests/udf.img.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..bd2deb0af39082dba05d2cc1da17ad21ddc85461 GIT binary patch literal 2031 zcmZuwX;_kp8vO(mFbNQ`pvJ%u5xb>`OQy-9sO3VaGcJvpn&Fb(QEv)uxRFsBF5_-O zhFhk%W!`cNEzN9P$fZ@yoHiRZt)}ccO}G2+o*(Zy&wI{u{vDP-f2TRqkL=~=`P%Du z08)Eu?f;^ikR|H}y8rg3pk>gG1Yo!Gy|)^SWU0m(;J-k8X8^$2Gwd-V0Dy;ns`~p0 zmf^p7TB1=7v-0{Je)Ih%s=otdE#Nu;o!q*x+Fr>ri``!m=lrsPVm?@X>`2b$4NTVWy zKC0#$$Po5!qF_E9;A_bK7X|2{eQ1&^jb2FOXUIMGJvS&<+m&15w2HmdeEw3Qy*rZ2 zN6-x9uY~7}t1HCnAq2Dv=;;{}a>zx1Rtf{mC$TGI*Sob^D%F&yIK?Vg8#mdPs6Quo zcnu$B;oR}~;Eg*55ToX}mFQzC?6PG_<|iktDp7#=GXL-y1t!+IC-L=dXxtv+MiEii z;1UYN%PtwHVDm~~EErtT*bw#(?5K%Y7dbElV~7lk2j^>n(l<`t?xjTxk$UE;X1voh zK?lTBfl?;GIz$k#0lLL_hqZ&VColiN;g|%$`xvC2LEy`R1@b@tDK0GEbA znJtn8UbIGS*)m0NW-?RY>kvpZ2CEOJWhH^}-iE`&OS(i?2)DLG9z3UWrzp>IhdC{% zzpc6{E~ja9S�*u*5f`V}>z=JonXzX$#g10Ly_###=uS`+eH$3KGeHg~|abWj9o zW^={GbRrQB*Zu=cj-n_ZebEj>2?DX8WA*5ACuy%i@{SbfQ^r~cGUVyw#7YMbzBU^0 zc=vIH3bL!hXLThlaP|>l<`8#Xikk6^$xr_PP~yk(m`ZJwZT1iGn~B^kO>Ur7+7Hoj zOvyIF#b2Ke@qE+Uf}mYBT28DX5PN#_$*Ugrv)EoR9*S?ORWL|I%=Y8i0Ve;t!?;TG z??qkMwe&7AaQ;U~wl0l>&UPgQX=8pSkWrYl*eu7a1NM3et9xD~?&?VXll+rOi4R^M zpL%FIu#T7Y#3zg+;+E2TxBW5@peQ6t)B~R*$)VEjC68^n>$EM}IwUETtgsNCqE5bX zwWtK{n^P^1+~ViJd!Wft7!wo}YPz$hOM_B}QuX0XiO33Pnx#kjIt7m4gVc>S!~C3c z#AaWYR6KDA0%MV;J)k>!yY{gbU|H$?ny74=t`5NkjpgD%>t8xv07%oIET<*M{sz&I&#wibyU+IkGrj;=ik|Ln zfAe)08de`y*Vf6)6_wSOuhchKG_|z0U2pHSbnRC4-tHe5{B3yjzUBDj1M7rSr_bk? zRo1t5-tIq`tP}y;^$7rA6I@6Ga5$fpm6aT!PqeSM-caOCw)Uo-Wp+( zo2BUVOm5=vt)hI|DHBHGNMxMTPOh#K(hoa0HIg|YDs)K?*}cj&cf`J*ofrgZ72N)O z3$$Z-&ID+rK1-EA#4HIuQPib)QGV34|H72$kTI}o^CqEPa8aIg(zRs#%9FW!p;i&hJE?ipFz&Idcu#!Ye)=?BV&PtsW(6~dW+f*lRaB_&HxziB zyLs)hZKJv`2iK8T{P}?^PWbU?HE!ijmFs(>ga|B;sYf;xp{SV)N#n70En~WU^<<|7 z+mtzKU2xtD37=3?cYOZ_b!a3uM z(Tw=g+n054pKBHJjI{6;?$R&sQ9B_qZB)6HuwA&}xm?`YY;;yw`o#1JOl}cPc0t;h zy+wfMTiHLs5#{O8R_vVO62Gd1trKt7&&_S~p(sDq8f6@8uI*k{j#CUIy(auV@pN-Af(44B#%_Dq8NQyQoQae0*kL zq^)u+U_fQ<#j`b=#h%|B#@;t>HW(Y=K16(FJf3F-S=>7?aBBgl3B6#U$zYDU+;I5M_F2h4<%F`a%6oqS&U|Li literal 0 HcmV?d00001 diff --git a/lib/blkid/tests/udf.results b/lib/blkid/tests/udf.results new file mode 100644 index 0000000..1f7aa48 --- /dev/null +++ b/lib/blkid/tests/udf.results @@ -0,0 +1,2 @@ +TYPE='udf' +LABEL='test-udf' -- 1.8.3.1