[mdb-dev] data.c and mdb-array.c changes

[<kn...@gr...>]

These changes make the string values of the empty string more tolerable.  I
suspect that the condition here is a "null" value in the column entry.
I leave it to people more database aware as to whether a "null" value for a
string type is equivalent to "".

I also changed the mdb-array.c to output default values of "0" when nulls
were encountered in the cases of MDB_INT and MDB_LONGINT, matching the value
of "" for MDB_TEXT and MDB_MEMO as well as fixing some escape problems for
C.

diff -r mdbtools/src/libmdb/data.c /tmp/mdbtools/src/libmdb/data.c
261c261
< 				return "(oops)";
---
> 				return "";
268c268
< 				return "(oops)";
---
> 				return "";

-- Karl --

begin 644 mdb-array.c
M+RH@341"(%1O;VQS("T@02!L:6)R87)Y(&9O<B!R96%D:6YG($U3($%C8V5S
M<R!D871A8F%S92!F:6QE"B J($-O<'ER:6=H=" @*$,I(#(P,# @0G)I86X@
M0G)U;G,*("H*("H*("H@5&AI<R!L:6)R87)Y(&ES(&9R964@<V]F='=A<F4[
M('EO=2!C86X@<F5D:7-T<FEB=71E(&ET(&%N9"]O<B *("H@;6]D:69Y(&ET
M('5N9&5R('1H92!T97)M<R!O9B!T:&4@1TY5($QI8G)A<GD@1V5N97)A;"!0
M=6)L:6,*("H@3&EC96YS92!A<R!P=6)L:7-H960@8GD@=&AE($9R964@4V]F
M='=A<F4@1F]U;F1A=&EO;CL@96ET:&5R"B J('9E<G-I;VX@,B!O9B!T:&4@
M3&EC96YS92P@;W(@("AA="!Y;W5R(&]P=&EO;BD@86YY(&QA=&5R('9E<G-I
M;VXN"B J"B J(%1H:7,@;&EB<F%R>2!I<R!D:7-T<FEB=71E9"!I;B!T:&4@
M:&]P92!T:&%T(&ET('=I;&P@8F4@=7-E9G5L+ H@*B!B=70@5TE42$]55"!!
M3ED@5T%24D%.5%D[('=I=&AO=70@979E;B!T:&4@:6UP;&EE9"!W87)R86YT
M>2!O9@H@*B!-15)#2$%.5$%"24Q)5%D@;W(@1DE43D534R!&3U(@02!005)4
M24-53$%2(%!54E!/4T4N("!3964@=&AE($=.50H@*B!,:6)R87)Y($=E;F5R
M86P@4'5B;&EC($QI8V5N<V4@9F]R(&UO<F4@9&5T86EL<RX*("H*("H@66]U
M('-H;W5L9"!H879E(')E8V5I=F5D(&$@8V]P>2!O9B!T:&4@1TY5($QI8G)A
M<GD@1V5N97)A;"!0=6)L:6,*("H@3&EC96YS92!A;&]N9R!W:71H('1H:7,@
M;&EB<F%R>3L@:68@;F]T+"!W<FET92!T;R!T:&4*("H@1G)E92!3;V9T=V%R
M92!&;W5N9&%T:6]N+"!);F,N+" U.2!496UP;&4@4&QA8V4@+2!3=6ET92 S
M,S L"B J($)O<W1O;BP@34$@,#(Q,3$M,3,P-RP@55-!+@H@*B\*"B\J('1H
M:7,@:7,@:6YH97)I=&5D(&9R;VT@;61B+65X<&]R="YC+"!M;V1I9FEE9"!T
M;R!M86ME(&%R<F%Y<R!S:6UI;&%R('1O"B @('1H;W-E(&=E;F5R871E9"!B
M>2!P87)S96-S=BYC("HO"@HC:6YC;'5D92 B;61B=&]O;',N:"(*"FUA:6X@
M*&EN="!A<F=C+"!C:&%R("HJ87)G=BD*>PII;G0@<F]W<SL*:6YT(&DL(&HL
M(&L["G5N<VEG;F5D(&-H87(@8G5F(%LR,#0X73L*361B2&%N9&QE("IM9&([
M"DUD8D-A=&%L;V=%;G1R>2!E;G1R>3L*361B5&%B;&5$968@*G1A8FQE.PI-
M9&)#;VQU;6X@*F-O;#L*+RH@9&]E<VXG="!H86YD;&4@=&%B;&5S(#X@,C4V
M(&-O;'5M;G,N("!#86X@=&AA="!H87!P96X_("HO"F-H87(@*F)O=6YD7W9A
M;'5E<R!;,C4V73L@"F-H87(@9&5L:6UI=&5R(%M=(#T@(BP@(CL*8VAA<B!Q
M=6]T95]T97AT(#T@,3L*:6YT(&-O=6YT.PII;G0@<W1A<G1E9#L*8VAA<B J
M8SL*"B!I9B @*&%R9V,@/" R*2 *(" @>PH@(" @(&9P<FEN=&8@*'-T9&5R
M<BP@(E5S86=E.B E<R \9FEL93X@/'1A8FQE/EQN(BP@87)G=B!;,%TI.PH@
M(" @(&5X:70@*#$I.PH@("!]"B *(&UD8B ](&UD8E]O<&5N("AA<F=V(%LQ
M72D["B *(&UD8E]R96%D7V-A=&%L;V<@*&UD8BP@341"7U1!0DQ%*3L*( H@
M9F]R(" H:2 ](# [(&D@/"!M9&(M/FYU;5]C871A;&]G.R!I*RLI( H@("![
M"B @(" @96YT<GD@/2!G7V%R<F%Y7VEN9&5X("AM9&(M/F-A=&%L;V<L($UD
M8D-A=&%L;V=%;G1R>2P@:2D["B @(" @:68@("@A<W1R8VUP("AE;G1R>2YO
M8FIE8W1?;F%M92P@87)G=B!;,ETI*2 *(" @(" @('L*"2!T86)L92 ](&UD
M8E]R96%D7W1A8FQE("@F96YT<GDI.PH)(&UD8E]R96%D7V-O;'5M;G,@*'1A
M8FQE*3L*"2!M9&)?<F5W:6YD7W1A8FQE("AT86)L92D["@D@"@D@9F]R("AJ
M(#T@,#L@:B \('1A8FQE+3YN=6U?8V]L<SL@:BLK*2 *"2 @('L*"2 @(" @
M8F]U;F1?=F%L=65S(%MJ72 ](" H8VAA<B J*2!M86QL;V,@*#(U-BD["@D@
M(" @(&)O=6YD7W9A;'5E<R!;:ET@6S!=(#T@)UPP)SL*"2 @(" @;61B7V)I
M;F1?8V]L=6UN("AT86)L92P@:B K(#$L(&)O=6YD7W9A;'5E<R!;:ETI.PH)
M(" @?0H*"2!F<')I;G1F("AS=&1O=70L("(O*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ+UQN(BD["@D@9G!R:6YT9B H<W1D;W5T+" B+RH@5$A)4R!)4R!!3B!!
M551/34%424-!3$Q9($=%3D52051%1"!&24Q%+B @1$\@3D]4($5$250@250A
M(2$A(2$@*B]<;B(I.PH)(&9P<FEN=&8@*'-T9&]U="P@(B\J*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ*BHJ
M*BHJ*BHJ*BHJ*BHO7&XB*3L*"2!F<')I;G1F("AS=&1O=70L(")<;B(I.PH)
M(&9P<FEN=&8@*'-T9&]U="P@(B-I;F-L=61E(#QS=&1I;RYH/EQN(BD["@D@
M9G!R:6YT9B H<W1D;W5T+" B(VEN8VQU9&4@7")T>7!E<RYH7")<;B(I.PH)
M(&9P<FEN=&8@*'-T9&]U="P@(B-I;F-L=61E(%PB9'5M<"YH7")<;B(I.PH)
M(&9P<FEN=&8@*'-T9&]U="P@(EQN(BD["@D@9G!R:6YT9B H<W1D;W5T+" B
M8V]N<W0@)7,@)7-?87)R87D@6UT@/2![7&XB+"!A<F=V(%LR72P@87)G=B!;
M,ETI.PH*"2!C;W5N=" ](# ["@D@<W1A<G1E9" ](# ["@D@=VAI;&4@*&UD
M8E]F971C:%]R;W<@*'1A8FQE*2D@"@D@("!["@D@(" @(&EF("AS=&%R=&5D
M("$](# I"@D@(" @(" @>PH)"2!F<')I;G1F("AS=&1O=70L("(L7&XB*3L*
M"2 @(" @("!]"@D@(" @('-T87)T960@/2 Q.PH)(" @("!F<')I;G1F("AS
M=&1O=70L(")[7'1<=%QT7'0O*B E-F0@*B]<;EQT(BP@8V]U;G0I.PH)(" @
M("!F;W(@("AJ(#T@,#L@:B \('1A8FQE+3YN=6U?8V]L<SL@:BLK*2 *"2 @
M(" @("!["@D)(&9P<FEN=&8@*'-T9&]U="P@(EQT(BD["@D)(&-O;" ](&=?
M<'1R7V%R<F%Y7VEN9&5X("AT86)L92T^8V]L=6UN<RP@:BD["@D)(&EF(" H
M<75O=&5?=&5X=" F)B *"0D@(" @(" H8V]L+3YC;VQ?='EP92 ]/2!-1$)?
M5$585"!\? H)"2 @(" @("!C;VPM/F-O;%]T>7!E(#T]($U$0E]-14U/*2D@
M"@D)(" @>PH)"2 @(" @9G!R:6YT9B H<W1D;W5T+" B7"(B*3L*"0D@(" @
M(&,@/2!B;W5N9%]V86QU97,@6VI=.PH)"2 @(" @9F]R("AK(#T@,#L@:R \
M('-T<FQE;B H8F]U;F1?=F%L=65S(%MJ72D[(&LK*RD*"0D@(" @(" @>PH)
M"0D@:68@*"@J8R ]/2 G7"(G*2!\?" H*F,@/3T@)UQ<)RDI"@D)"2 @('L*
M"0D)(" @("!F<')I;G1F("AS=&1O=70L(")<7"(I.PH)"0D@("!]"@D)"2!F
M<')I;G1F("AS=&1O=70L("(E8R(L("IC*RLI.PH)"2 @(" @("!]"@D)(" @
M("!F<')I;G1F("AS=&1O=70L(")<(B(I.PH)"2 @('T@"@D)(&5L<V4@:68@
M*"@H8V]L+3YC;VQ?='EP92 ]/2!-1$)?3$].1TE.5"D@?'P@"@D)"2 @("AC
M;VPM/F-O;%]T>7!E(#T]($U$0E])3E0I*2 F)@H)"0D@('-T<FQE;B H8F]U
M;F1?=F%L=65S(%MJ72D@/3T@,"D*"0D@("!["@D)(" @("!F<')I;G1F("AS
M=&1O=70L("(P(BD["@D)(" @?0H)"2!E;'-E"@D)(" @>PH)"2 @(" @9G!R
M:6YT9B H<W1D;W5T+" B)7,B+"!B;W5N9%]V86QU97,@6VI=*3L*"0D@("!]
M"@D)(&EF("AJ("$]('1A8FQE+3YN=6U?8V]L<R M(#$I"@D)(" @>PH)"2 @
M(" @9G!R:6YT9B H<W1D;W5T+" B)7-<;B(L(&1E;&EM:71E<BD["@D)(" @
M?0H)"2!E;'-E"@D)(" @>PH)"2 @(" @9G!R:6YT9B H<W1D;W5T+" B7&XB
M*3L*"0D@("!]"@D@(" @(" @?0H)(" @("!F<')I;G1F("AS=&1O=70L(")]
M(BD["@D@(" @(&-O=6YT*RL["@D@("!]"@D@9F]R(" H:B ](# [(&H@/"!T
M86)L92T^;G5M7V-O;',[(&HK*RD@"@D@("!["@D@(" @(&9R964@*&)O=6YD
M7W9A;'5E<R!;:ETI.PH)(" @?0H@(" @(" @?0H@("!]"B *(&UD8E]F<F5E
M7VAA;F1L92 H;61B*3L*"B!F<')I;G1F("AS=&1O=70L(")<;GT[7&XB*3L*
M(&9P<FEN=&8@*'-T9&]U="P@(EQN8V]N<W0@:6YT("5S7V%R<F%Y7VQE;F=T
I:" ]("5D.UQN(BP@"@D@(&%R9W8@6S)=+ H)("!C;W5N="D["@I]"@IE
 
end