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 917447b6d..00cf85071 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 zc-n1~X)Iy%8>+!SWshNh=^?|;*n``C~A2S>WoKYre=7gJL;y=g%=rR;W6GO zWO!wYSLT*iXlZ7HN*;S<|3zk2{+u!Sr z_pbn??$p}E<4onB^2mlbEpR2#! zU>V`hUPm;_W&WA8)@o(I|1b=qZzV?x3%9Z^Gc05RfP$sCW73xyYPbl{BIp9{czBDD zIcy$*qz40l2O;FL1{jb5y=p*5EI!8}{xLxS)Vj?6zXr7`m;e#XlFI}FfS^;XRhh*Y z)d&n_NC$UOh=2hIwEp{_5!R0(yU`g%bU~KfYu^jQ3XOe*6<(*rTO$xG6*+jIcmgEd zQ2ttY&ZMSNtWhJO)j)5rTF9jo13GC;uz<{|id*mAW~J0npWzj&JOqBSKgnP&`O$Sk zxTQ$glH{o>O6Bo%<3$zs9ERq3%=>l>;uN zLcHx$fl3a)6vl?Z6-|xd@4-&m$aPVJY8X>wR5CPQ2b8^a_VFkyW{Na3*R&Iyr-`~C zz6z8!0oEmffDOCq-4ZaSE!eDU*aC&wMnBZeHJiMewa)a>dO64JQx_687t#(+@g9qAc zn&WeuN0;>(K8H}74ga#ecOH-3{(`6B$~l5QIs%g&ywf1ymbi6_D)G!6+1kXuc()ATrDnz z`{mZiqqg`v@*iq*6(&Rlm6qw^<=Uv!rB;7DQ!28?n`P^h|4@OO{88#opJ9E;Jz~4B zTPmJ71c9;1)1J^Beck)m3$X0W0c~^+T~C+jiox;lp!KhwbYYJNZ{ddQEH`bvv42wB zdp#K{ulj^f$%se>;T*}XIYM0~9RN^f!P(ABP6Lf1weQb`pnEU&05g67Sc;kM>3I9i z9_vr5YwP3{imI9`R~s5Fn_Ju3Z*+87x%H^}?hFhL{W3iIz-oN*p-tkc(-#WLs~Xz6 z?hG7ERf>S^27kC{8&X6E@Oa;qm6cqf)lGPF5?h!N=0@xMTQKiS7h^+O{u*(UyOrql zOkUFP?cxIZDN|(DZKOLHfYE4 zoGH*md!8f<=Wy7LZMLNYWpOltSqxdIo;ynrV`x(;=iKRzvhBeGEhMk(4Qdy~a&{*hs?$-4y zc1@c8TzqGK$(M(2c;Tm`HTadg)ove*6C-hamOjNugr=QeNEwf_ZynR?Z=g6Y*rmO=BhN(98(`s4dIXu_g!p&tZ4E}ps?X@>IR7=-VqzjUz&&r5sT+&b}g{oLF(U#jwRopIK|mb#v0Ro;;t_o5ePLyg^gDyzq4 zI)00J*|AayUZ<_>x7>Z$_8^%ol}agmp2t6Tf$tP6vTmyov$CNvCq?h`7hrNg1mZ>` zw|(-n`KrD=EdLjXl*$P)iwDgR(`oW4@PH!Wxx}fpadc-@`u-Ur&&JD^+ZC4i3S`GyQ=&YN^&fm8x6-?rqKjB z!jqv$(V9{b6<%MoIh$rwve;lqm8SO81s}phzO-T z`F(U4yypU$vP5E9zZNe%!tu~jK78`GnwwVB43^CCnA(#H7DC+2~Xs6c8r@2#n=z3KR`?X!}<%ZcS