msdosfs permissions

["Erik Wikström" <erik-wikstrom@xxxxxxxxx>]

This patch adds the -M option to mount_msdos, which sets the permissions for
directories separate from the permissions of files. The code is taken
straight from the this commit to FreeBSD by Tom Rhodes:
http://lists.freebsd.org/pipermail/cvs-src/2003-August/008786.html

mount_msdos.diff: Changes to files in src/sbin/mount_msdos
msdos.diff: Changes to files in src/sys/vfs/msdosfs
Both are agains 1.3-Preview

Someone really ought to take a look at it if you are interested in this
feature, I'm not good at C and don't know if it's either WARNS?=6 or
style(9). It seems to work fine tough I don't really know how to make any
advanced tests.

--
Erik Wikström


begin 666 msdosfs.diff
M9&EF9B M=2 O=7-R+W-R8R]S>7,O=F9S+VUS9&]S9G,O;7-D;W-F<U]V9G-O
M<',N8R N+VUS9&]S9G-?=F9S;W!S+F,*+2TM("]U<W(O<W)C+W-Y<R]V9G,O
M;7-D;W-F<R]M<V1O<V9S7W9F<V]P<RYC"3(P,#4M,#(M,#(@,C(Z,S0Z,3@N
M,# P,# P,# P("LP,3 P"BLK*R N+VUS9&]S9G-?=F9S;W!S+F,),C P-2TP
M-"TP.2 Q-CHP.3HS-RXP,# P,# P,# @*S R,# *0$ @+3$Q,RPV("LQ,3,L
M-R! 0 H@"7!M<"T^<&U?9VED(#T@87)G<"T^9VED.PH@"7!M<"T^<&U?=6ED
M(#T@87)G<"T^=6ED.PH@"7!M<"T^<&U?;6%S:R ](&%R9W M/FUA<VL@)B!!
M3$Q015)-4SL**PEP;7 M/G!M7V1I<FUA<VL@/2!A<F=P+3YD:7)M87-K("8@
M04Q,4$5235,["B )<&UP+3YP;5]F;&%G<R!\/2!A<F=P+3YF;&%G<R F($U3
M1$]31E--3E1?34Y43U!4.PH@"6EF("AP;7 M/G!M7V9L86=S("8@35-$3U-&
M4TU.5%]5,E=404),12D@>PH@"0EB8V]P>2AA<F=P+3YU,G<L('!M<"T^<&U?
M=3)W+"!S:7IE;V8H<&UP+3YP;5]U,G<I*3L*9&EF9B M=2 O=7-R+W-R8R]S
M>7,O=F9S+VUS9&]S9G,O;7-D;W-F<U]V;F]P<RYC("XO;7-D;W-F<U]V;F]P
M<RYC"BTM+2 O=7-R+W-R8R]S>7,O=F9S+VUS9&]S9G,O;7-D;W-F<U]V;F]P
M<RYC"3(P,#4M,#(M,34@,#DZ,S(Z,3@N,# P,# P,# P("LP,3 P"BLK*R N
M+VUS9&]S9G-?=FYO<',N8PDR,# U+3 T+3 Y(#$V.C Y.C,W+C P,# P,# P
M," K,#(P, I 0" M,C0V+#<@*S(T-BPW($! "B *( EF:6QE7VUO9&4@/2 H
M4U])6%534GQ37TE81U)0?%-?25A/5$@I('P@*%-?25)54U)\4U])4D=24'Q3
M7TE23U1(*2!\"B )(" @("@H9&5P+3YD95]!='1R:6)U=&5S("8@05144E]2
M14%$3TY,62D@/R P(#H@*%-?25=54U)\4U])5T=24'Q37TE73U1(*2D["BT)
M9FEL95]M;V1E("8]('!M<"T^<&U?;6%S:SL**PEF:6QE7VUO9&4@)CT@*'9P
M+3YV7W1Y<&4@/3T@5D1)4B _('!M<"T^<&U?9&ER;6%S:R Z('!M<"T^<&U?
M;6%S:RD["B *( DO*@H@"2 J($1I<V%L;&]W('=R:71E(&%T=&5M<'1S(&]N
M(')E860M;VYL>2!F:6QE('-Y<W1E;7,["D! ("TS-#,L-R K,S0S+#@@0$ *
M( D);6]D92 ](%-?25)76%5\4U])4E=81WQ37TE25UA/.PH@"65L<V4*( D)
M;6]D92 ](%-?25)54U)\4U])6%534GQ37TE21U)0?%-?25A'4E!\4U])4D]4
M2'Q37TE83U1(.PHM"79A<"T^=F%?;6]D92 ](&UO9&4@)B!P;7 M/G!M7VUA
M<VL["BL)=F%P+3YV85]M;V1E(#T@;6]D92 F( HK"0DH87 M/F%?=G M/G9?
M='EP92 ]/2!61$E2(#\@<&UP+3YP;5]D:7)M87-K(#H@<&UP+3YP;5]M87-K
M*3L*( EV87 M/G9A7W5I9" ]('!M<"T^<&U?=6ED.PH@"79A<"T^=F%?9VED
M(#T@<&UP+3YP;5]G:60["B )=F%P+3YV85]N;&EN:R ](#$["F1I9F8@+74@
M+W5S<B]S<F,O<WES+W9F<R]M<V1O<V9S+VUS9&]S9G-M;W5N="YH("XO;7-D
M;W-F<VUO=6YT+F@*+2TM("]U<W(O<W)C+W-Y<R]V9G,O;7-D;W-F<R]M<V1O
M<V9S;6]U;G0N: DR,# T+3 R+3 U(#(R.C S.C,W+C P,# P,# P," K,#$P
M, HK*RL@+B]M<V1O<V9S;6]U;G0N: DR,# U+3 T+3 Y(#$V.C Y.C,W+C P
M,# P,# P," K,#(P, I 0" M-C@L-R K-C@L."! 0 H@"61E=E]T('!M7V1E
M=CL)"2\J(&)L;V-K('-P96-I86P@9&5V:6-E(&UO=6YT960@*B\*( EU:61?
M="!P;5]U:60["0DO*B!U:60@=&\@<V5T(&%S(&]W;F5R(&]F('1H92!F:6QE
M<R J+PH@"6=I9%]T('!M7V=I9#L)"2\J(&=I9"!T;R!S970@87,@;W=N97(@
M;V8@=&AE(&9I;&5S("HO"BT);6]D95]T('!M7VUA<VL["0DO*B!M87-K('1O
M(&%N9"!W:71H(&9I;&4@<')O=&5C=&EO;B!B:71S("HO"BL);6]D95]T('!M
M7VUA<VL["0DO*B!M87-K('1O(&%N9"!W:71H(&9I;&4@<')O=&5C=&EO;B!B
M:71S(&9O<B!F:6QE<R J+PHK"6UO9&5?="!P;5]D:7)M87-K.R )+RH@;6%S
M:R!T;R!A;F0@=VET:"!F:6QE('!R;W1E8W1I;VX@8FET<R!F;W(@9&ER96-T
M;W)I97,@*B\*( ES=')U8W0@=FYO9&4@*G!M7V1E=G9P.PDO*B!V;F]D92!F
M;W(@8FQO8VL@9&5V:6-E(&UN=&0@*B\*( ES=')U8W0@8G!B-3 @<&U?8G!B
M.PDO*B!"24]3('!A<F%M971E<B!B;&L@9F]R('1H:7,@9G,@*B\*( EU7VQO
M;F<@<&U?0FQK4&5R4V5C.PDO*B!(;W<@;6%N>2!$159?0E-)6D4@8FQO8VMS
M(&9I="!I;G-I9&4@82!P:'ES:6-A;"!S96-T;W(@*B\*0$ @+3(Q."PW("LR
M,3DL."! 0 H@"7-T<G5C= EE>'!O<G1?87)G<R!E>'!O<G0["2\J(&YE='=O
M<FL@97AP;W)T(&EN9F]R;6%T:6]N("HO"B )=6ED7W0)=6ED.PD)+RH@=6ED
M('1H870@;W=N<R!M<V1O<V9S(&9I;&5S("HO"B )9VED7W0)9VED.PD)+RH@
M9VED('1H870@;W=N<R!M<V1O<V9S(&9I;&5S("HO"BT);6]D95]T"6UA<VL[
M"0DO*B!M87-K('1O(&)E(&%P<&QI960@9F]R(&US9&]S9G,@<&5R;7,@*B\*
M*PEM;V1E7W0);6%S:SL)"2\J(&9I;&4@;6%S:R!T;R!B92!A<'!L:65D(&9O
M<B!M<V1O<V9S('!E<FUS("HO"BL);6]D95]T"61I<FUA<VL["2\J(&1I<B!M
M87-K('1O(&)E(&%P<&QI960@9F]R(&US9&]S9G,@<&5R;7,@*B\*( EI;G0)
M9FQA9W,["0DO*B!S964@8F5L;W<@*B\*( EI;G0@;6%G:6,["0DO*B!V97)S
M:6]N(&YU;6)E<B J+PH@"75?:6YT,39?="!U,G=;,3(X73L@(" @("\J($QO
68V%L+3Y5;FEC;V1E('1A8FQE("HO"@``
`
end

begin 666 mount_msdos.diff
M9&EF9B M=2 O=7-R+W-R8R]S8FEN+VUO=6YT7VUS9&]S+VUO=6YT7VUS9&]S
M+C@@+B]M;W5N=%]M<V1O<RXX"BTM+2 O=7-R+W-R8R]S8FEN+VUO=6YT7VUS
M9&]S+VUO=6YT7VUS9&]S+C@),C P,RTP-BTQ-R P-CHR-SHS,RXP,# P,# P
M,# @*S R,# **RLK("XO;6]U;G1?;7-D;W,N. DR,# U+3 T+3 Y(#$V.C(W
M.C0R+C P,# P,# P," K,#(P, I 0" M-#,L-B K-#,L-R! 0 H@+D]P($9L
M('4@07(@=6ED"B N3W @1FP@9R!!<B!G:60*("Y/<"!&;"!M($%R(&UA<VL*
M*RY/<"!&;"!-($%R(&UA<VL*("Y/<"!&;"!S"B N3W @1FP@; H@+D]P($9L
M(#D*0$ @+3$P-RPQ," K,3 X+#(T($! "B!/;FQY('1H92!N:6YE(&QO=RUO
M<F1E<B!B:71S(&]F"B N07(@;6%S:PH@87)E('5S960N"BM4:&4@=F%L=64@
M;V8**RY!<B M30HK:7,@=7-E9"!I9B!I="!I<R!S=7!P;&EE9"!A;F0**RY!
M<B M;0HK:7,@;VUI='1E9"X*(%1H92!D969A=6QT"B N07(@;6%S:PH@:7,@
M=&%K96X@9G)O;2!T:&4*(&1I<F5C=&]R>2!O;B!W:&EC:"!T:&4@9FEL92!S
M>7-T96T@:7,@8F5I;F<@;6]U;G1E9"X**RY)="!&;"!-($%R(&UA<VL**U-P
M96-I9GD@=&AE(&UA>&EM=6T@9FEL92!P97)M:7-S:6]N<R!F;W(@9&ER96-T
M;W)I97,**VEN('1H92!F:6QE<WES=&5M+@HK5&AE('9A;'5E(&]F"BLN07(@
M+6T**VES('5S960@:68@:70@:7,@<W5P<&QI960@86YD"BLN07(@+4T**VES
M(&]M:71T960N"BM3964@=&AE('!R979I;W5S(&]P=&EO;B=S(&1E<V-R:7!T
M:6]N(&9O<B!D971A:6QS+@H@+DET($9L(',*($9O<F-E(&)E:&%V:6]U<B!T
M;PH@:6=N;W)E(&%N9"!N;W0@9V5N97)A=&4@5VEN)SDU(&QO;F<@9FEL96YA
M;65S+@ID:69F("UU("]U<W(O<W)C+W-B:6XO;6]U;G1?;7-D;W,O;6]U;G1?
M;7-D;W,N8R N+VUO=6YT7VUS9&]S+F,*+2TM("]U<W(O<W)C+W-B:6XO;6]U
M;G1?;7-D;W,O;6]U;G1?;7-D;W,N8PDR,# U+3 T+3 R(#(S.C0Q.C V+C P
M,# P,# P," K,#(P, HK*RL@+B]M;W5N=%]M<V1O<RYC"3(P,#4M,#0M,#D@
M,38Z,#DZ,S<N,# P,# P,# P("LP,C P"D! ("TU-BPW("LU-BPW($! "B *
M("\J"B @*B!86%@@+2!N;R!W87D@=&\@<W!E8VEF>2 B9F]O/3QB87(^(BUT
M>7!E(&]P=&EO;G,[('1H870G<R!W:&%T('=E)V0*+2 J('=A;G0@9F]R("(M
M=2(L("(M9R(L("(M;2(L("(M3"(L(&%N9" B+5<B+@HK("H@=V%N="!F;W(@
M(BUU(BP@(BUG(BP@(BUM(BP@(BU-(BP@(BU,(BP@86YD("(M5R(N"B @*B\*
M('-T871I8R!S=')U8W0@;6YT;W!T(&UO<'1S6UT@/2!["B )34]05%]35$1/
M4%13+ I 0" M.#0L,34@*S@T+#$U($! "B!["B )<W1R=6-T(&US9&]S9G-?
M87)G<R!A<F=S.PH@"7-T<G5C="!S=&%T('-B.PHM"6EN="!C+"!E<G)O<BP@
M;6YT9FQA9W,L('-E=%]G:60L('-E=%]U:60L('-E=%]M87-K.PHK"6EN="!C
M+"!E<G)O<BP@;6YT9FQA9W,L('-E=%]G:60L('-E=%]U:60L('-E=%]M87-K
M+"!S971?9&ER;6%S:SL*( EC:&%R("ID978L("ID:7(L(&UN='!A=&A;34%8
M4$%42$Q%3ET["B )<W1R=6-T('9F<V-O;F8@=F9C.PH@"BT);6YT9FQA9W,@
M/2!S971?9VED(#T@<V5T7W5I9" ]('-E=%]M87-K(#T@,#L**PEM;G1F;&%G
M<R ]('-E=%]G:60@/2!S971?=6ED(#T@<V5T7VUA<VL@/2!S971?9&ER;6%S
M:R ](# ["B );65M<V5T*"9A<F=S+" G7# G+"!S:7IE;V8H87)G<RDI.PH@
M"6%R9W,N;6%G:6,@/2!-4T1/4T937T%21U--04=)0SL*( HM"7=H:6QE("@H
M8R ](&=E=&]P="AA<F=C+"!A<F=V+" B<VPY=3IG.FTZ;SI,.E<Z(BDI("$]
M("TQ*2!["BL)=VAI;&4@*"AC(#T@9V5T;W!T*&%R9V,L(&%R9W8L(")S;#EU
M.F<Z;3I-.F\Z3#I7.B(I*2 A/2 M,2D@>PH@"0ES=VET8V@@*&,I('L*("-I
M9F1E9B!-4T1/4T9334Y47T=%341/4T93"B )"6-A<V4@)T<G.@I 0" M,3(P
M+#8@*S$R,"PQ,"! 0 H@"0D)87)G<RYM87-K(#T@85]M87-K*&]P=&%R9RD[
M"B )"0ES971?;6%S:R ](#$["B )"0EB<F5A:SL**PD)8V%S92 G32<Z"BL)
M"0EA<F=S+F1I<FUA<VL@/2!A7VUA<VLH;W!T87)G*3L**PD)"7-E=%]D:7)M
M87-K(#T@,3L**PD)"6)R96%K.PH@"0EC87-E("=,)SH*( D)"6QO861?=6QT
M86)L92@F87)G<RP@;W!T87)G*3L*( D)"6%R9W,N9FQA9W,@?#T@35-$3U-&
M4TU.5%]53%1!0DQ%.PI 0" M,30Q+#8@*S$T-2PQ-2! 0 H@"6EF("AO<'1I
M;F0@*R R("$](&%R9V,I"B )"75S86=E*"D["B **PEI9B H<V5T7VUA<VL@
M)B8@(7-E=%]D:7)M87-K*2!["BL)"6%R9W,N9&ER;6%S:R ](&%R9W,N;6%S
M:SL**PD)<V5T7V1I<FUA<VL@/2 Q.PHK"7T**PEE;'-E(&EF("AS971?9&ER
M;6%S:R F)B A<V5T7VUA<VLI('L**PD)87)G<RYM87-K(#T@87)G<RYD:7)M
M87-K.PHK"0ES971?;6%S:R ](#$["BL)?0HK"B )9&5V(#T@87)G=EMO<'1I
M;F1=.PH@"61I<B ](&%R9W9;;W!T:6YD("L@,5T["B *0$ @+3$V-BPW("LQ
M-SDL-R! 0 H@"0EI9B H(7-E=%]G:60I"B )"0EA<F=S+F=I9" ]('-B+G-T
M7V=I9#L*( D):68@*"%S971?;6%S:RD*+0D)"6%R9W,N;6%S:R ]('-B+G-T
M7VUO9&4@)B H4U])4E=852!\(%-?25)76$<@?"!37TE25UA/*3L**PD)"6%R
M9W,N;6%S:R ](&%R9W,N9&ER;6%S:R ]('-B+G-T7VUO9&4@)B H4U])4E=8
M52!\(%-?25)76$<@?"!37TE25UA/*3L*( E]"B *( EE<G)O<B ](&=E='9F
M<V)Y;F%M92@B;7-D;W,B+" F=F9C*3L*0$ @+3(T-"PW("LR-3<L-R! 0 H@
M=7-A9V4H=F]I9"D*('L*( EF<')I;G1F*'-T9&5R<BP@(B5S7&XE<UQN(BP@
M"BT)(G5S86=E.B!M;W5N=%]M<V1O<R!;+6\@;W!T:6]N<UT@6RUU('5S97)=
M(%LM9R!G<F]U<%T@6RUM(&UA<VM=(BP**PDB=7-A9V4Z(&UO=6YT7VUS9&]S
M(%LM;R!O<'1I;VYS72!;+74@=7-E<ET@6RUG(&=R;W5P72!;+6T@;6%S:UT@
M6RU-(&UA<VM=(BP*( DB(" @(" @(" @(" @(" @(" @(%LM<UT@6RUL72!;
M+3E=(%LM3"!L;V-A;&5=(%LM5R!T86)L95T@8F1E=B!D:7(B*3L*( EE>&ET
/*$587U5304=%*3L*('T*
`
end