lynx-dev patches to LYReadCFG.c

[John E. Davis]

Hi,

   Here are patches to LYReadCFG.c.  In particular, I replaced the
ugly read_cfg function by a table driven one, in a similar spirit to
my patches to the parse_arg function in LYMain.c.  A typical entry in
the read_cfg table looks like:

     {"BOLD_HEADERS", CONF_BOOL,  (long) &bold_headers},

This is much cleaner and easier to maintain and expand.  For example,
there has been some discussion about making a SCROLL_STEP variable
configurable.  This would require little more than adding a table entry:

     {"SCROLL_STEP", CONF_INT,  (long) &Scroll_Step}

provided Scroll_Step exists.

If this patch is accepted, then I know a nice way to get rid of all
those silly global variables such as `cso_proxy_putenv_cmd'.

Here is the patch to LYReadCFG.c followed by a uuencoded and gzipped
readcfg.c:

--- LYReadCFG.c.ORIG    Sat Apr 25 19:46:27 1998
+++ LYReadCFG.c Sun Apr 26 04:01:06 1998
@@ -437,6 +437,11 @@
 }
 #endif /* USE_COLOR_TABLE */
 
+#define USE_DAVIS_READ_CFG 1
+#ifdef USE_DAVIS_READ_CFG
+#include "readcfg.c"
+#else
+
 /*
  * Process the configuration file (lynx.cfg).
  */
@@ -1344,3 +1349,5 @@
        }
     }
 }
+
+#endif                                /* USE_DAVIS_READ_CFG */


begin 644 readcfg.c.gz
M'XL("#?U0C4``W)E861C9F<N8P#47&UWFTB6_BS_BHIS$DN.G=C=VSVSG<W,
M00C;=!!H!(KC[>1P,"I)M"70`/address@hidden'9F/VR.CV-!W:=NW;JO
M]:*74SH+0DJ&RF?7T$W-[4_.SK2Q:VAFYY>3T[V]]&%-H0U)TGCCIWO?]@@A
M_L*+R6'HK>A[_!B$*<%F[_=>"C35,L_<OF49G<XI8?_>'1+\K"DF:TH.WY4;
MGTW,3N>G\C/==#J=G\O/%,.P5-=VQIW.?Y3?:.:G3N>7O+=9'*T(#6^#.`I7
M%#B\]>+`NUYN=ZV;JC$9:)W.KSEQ$/K+S9226;"DQ\=DX853($S6U`^\Y1:`
M,ABXNJ,-.YV_;+]PQA/;T0:=OU8ZY=+Y3ZG+E,YI3-*%ET*'";F.HB7U0N![
MN6%,HZB743CG3][O?=]3HW`6S%V'R7XO2;TT\-EL>$FR65$7YRFAJ3O;A*0K
M-2:'Z?7R2$PC0^OQB=V$23`/Z92!!.]9E]W;*)CV"%"PR;;36%DN(address@hidden
MB:KPGH;Z4!.]'7'^>JSU+(I)-R`?R,E[4M?XC^#K>Q*\>=/;8W)H:`+TCF58
ME]JXMD=HP7N;J,;5`J;*A6Y=&`O,%_F0(9_35+R]?D#B6BB.$]-T$X?`,\BX
M1JPP>F_YX\*MR+99N*R_)TFX2M$DYIIV=;*N:581^(5S!J;R1+E787M<"(](
M?Q/&U/_WJW:S^%F'3Q)_E:))_#7MZL1?TZQ6W^/=Q%Z%:]=Y;.3Y*8W='U7V
MTJ,E#;G,X0\8,T07_*,K2;;B=V1!&U?8(6,(@U"2RY=\X\,GP8QT7P!HZ*_6
M'/2HCNH(N^\A68?XFSB&..%FC3X`UQURX0P-FZ9C[VX83>F`SKS-,NT&/7QW
M'5/OYKWH\?L>^]4JRF@)\[2S"*O:N<;9<AE(25!-W4TYLRX$DIN5%]^X,V:B
MS^F^:ALYY-J;TY(]E)KU1;,1:U4BJFD][`]=Q4TVUUG#/TZ^/H%J2A,_#M8I
MHQI.#`=#[,>A,OYHNP/M3($GN\G+]_P%=9/@?YXOK`M'11`;,$!CO30*Y`E#
MY91;_!?YJ5<A^6DG3NDT2)^K4;F1/"0I70FH7EFV_&%I?IM8"C>K:QHGK@<_
M<1S=)<_7<V0K2%S(-ZF0FO";address@hidden,B<#/O:V'85^!F/K4N;\4>7
M":UK#;GM1VRHN9Q.&[0'FTS$FP0\'V+\V'BX+_(2ZD>%0]HWK4^ZJNT?D5^S
M(>;=X0#96W=H#;1\:"address@hidden"UK8\#ZI0Z+O1QJ`UUQ=D=4!I\4D_'WESI,\7H@
M\+:D^3*88>$PT$'8KCT9C:RQ4Q)Q$%.8'QINGJW!WE0`!*##33[Q)0VGP:PT
MNW]N5NNG>4/VY'HSFT&*_D=-L?2U/J-(UC'T!Q+FI"#4WR?#T9EN:+^]2O9+
MEL7FP;CZ'5C3PR`5%)G@(4)A`V>LJ%H/address@hidden<>1NDDYIC,!G'@QH2M((!C\/
MP*AC\BKY$D(G`DE$JO88!5:S\M;M<H$VLE0.H;%?/WQDN8NO>8CW%W$7B(_(
MP6\'$'5?H!$;1J^316V&].8--#[X<G*0158HCM`EW4'\7&$EEY`HA#*)0G4W
MA;]GR#.,!]A>!U`=+:'&2MZ28S)PL&J2\@'6AC,`S*31#6,-1$>^I%_"E_L]
M$':G(M>]3F>_C`\=ODI0S/![QF2.0D941,ND7+8MS$+V'>O\W-#<"\T8[;=Q
M8%Q-$FI&MX%/#1B+<Q>!0,X4P^9&^[UM^EA*O8B2U/address@hidden,)PP?C2ME.C4R
M,`6Q&E,.8>?&E?E9/===YFE+/#V$]_X\<*5B_(<,O@;O"::/U!#<YS^0#66:
M;5R-O'1AS687T8I:'S._^=,OO_:*3+044`WHW`[F6"N5;#^3..(Y$<))8)"Y
M%F1Y^UUQ9:]1H]LX:ZZMG[OHDPBDO:C9!Z^2`^8YMCK^SO7ZV^/@I`*-F"1(
MR+4W?4OT>1A!Z_E;[`78*#7M/:[F(84$PU]LPIL?S=-,0%(1J"%7>W?(AGI(
address@hidden/I0)(#$.,W0NV=D*.1T`=)`[M%7
MG0TYP;LB/RSW\;<*0J^*^*'*5GNZA@(address@hidden&XJU(CI(#C8^
MW:+*)"=:_Y#PY(DOMWA<>&OPBZ#!S_<@H/.`,^(PP$`YY64,A)&+?6%7T*!;
MH1!!H3TO9T9)GU\CH,/-,-+(74)BD;FFU^)YTLY!`ME'</_<E8,C\N?[(M-8
M!2OJ\J7F_!F]3R$"!%%8GX+DKT&"8N$T2TRR18>\20]*L9]%PD7(O_Y%NIB?
MH*2[><]Y)B/1B80FR]4*2>address@hidden,L:,`8^;I&WK)^04-^C<address@hidden
MBS_?O)&7D&2*/")\S]VK1/address@hidden@T'"3X$`#CVE]_MYU@;BR015TQ15EI?C
MNU(DBUU;IG$TF^W:.$ZEIF)^+AR;IC932WD.9;*_7@<IQ+_3MR>]2EFY`_%U
M$'KQ0T[>:AQR]?WO69NI*=I+O:!ZC"=:J\W>!O3N*4ZCV3HYDFRN1=:VO2I8
M,7=_7;L%(=NB,.DMF^;<-=LSYTLR9FD"address@hidden(4[
ME-MF!D->O\[$)T0KB'L05$_Q-3F4"8]/F;$=?/ER4(address@hidden>>
M?Y,LO61!DZR'address@hidden(?-)_;address@hidden:W;%<(H3R</address@hidden@):AA+
M,]8Q38#,address@hidden<@T2-9+3Z;address@hidden(K%TM/_Y4C<'
MUJ6]+Q:6F7#]-8Q[3L%?W'8'address@hidden"K\KF[&4ELRXHJ
MYA$2:$X-_N:(_(address@hidden@_4/address@hidden>/_R?\?Z-+<;O#-@,
M5U/&/*Z#N_9<WVWSDHOL7+._V2;U'V#&>X*_;_N*H8T=6U-M""address@hidden"1N
M!X,1*DL:IS;UD^]'!<6E<F6[8\V>](>ZXXXLV\FI<>]9(C>N8&";ZU60LJP6
M441-KWW65%'0EW'%KK:+#3)4:;>[`!?M&=!(<2X0FQ?E&:!M3X::JUXH8UMS
M,JRSB5E@;.]F2^/DY(:E*L8N(%M[MUM0$W,,O.X`M;address@hidden/+MN$</-=
MB$;I#_O#/O!U0Z<address@hidden,W(O3!IKK:#F%M]7FFC+0QDW],)H%]:address@hidden
M5DSUPFJGQFTSUPO]121#J(JMN;9FVKJC?P(</N.6"4BU4.A]7#"D)$B#6RKA
M@,@5U='&;I/@M_8B96)-!3'K1@/__H+Z-U#Q!DN)QC(,903,]\>NHYPW3Y`:
M+9?>.J']L60;address@hidden>NZS[;\M&_"3"(JLZ/XAH]/,3WD_GX;V
M7@<]+1!A%MK)AY11N>L-^F;77TU+P-]+&!E_-KCX<V:+N>address@hidden,YQ
M16J+7[&=EJLV6[:I'7/C'F0Q"QF8JL`<NK;^W^U(Y=VY;1AMH#L-$["];;9-
M#N%/^UP:3YUT(address@hidden;8"/VM5(X7LBKFZ[6[M4M9S5[IYM8X/*C1ERZ_!*
M6U9<address@hidden>address@hidden"W_K'Q6V8,7V1/7'6BJVJMV_4D?.Q-PL4-M:(VO2M-4
MCD47SJ<@3B$K&T)0C1]P=:70G]HMH:PG]G"HF9/ZT95VB[95TKHT#0O]GQR.
M\%26Q!NDB.$RJGA`;:BH-DZ;77)==9Z`KCP_<address@hidden&;])7U(]-
MM"'&=1>*8G`FF&F4/8GV&1R?J1BYG68/6H:#Y6<<0OZ[)0V8RCDHP=-]BDS8
MXE9$-V?66(6AVQ!YP1/address@hidden>6YV,M49'>A;%/H7V*KB#@":0LFQBR89FZ?HY
M/&=4CS-\;EA]4&*4+80KR'>'RJC-SN?+Z!K2!5;G)Y#U00!9;Z%AU%%WPL%T
ML0PQC]:+9TV43+C#N"W'XGN5#5,SC]+(Y?N$!17N5#WF"address@hidden@>L
MLWS,&H(]-^:=BR`!/QRPA$QL[14PB_19RE"0/2X5;)L\LX]DUT[$Z=+"6;*/
MA12P`[GUF=6<Y^OA+"JG^;B;[([&UG#DM,T2[G<#OZMU6B9MU0DDVM*);/NZ
MUD?+V^H%";A6R<Q*!,5N<]'<`/UQ3>TRCYV-WL0`_<$5<9-'SSJ(@>)HCP,,
MO)2*S"ZLI$L,"OS<4&D5,*Z+XRF\E9=N.6-6FUQ`_064NE*?`-3LVTK#8<7-
MP`)'8[8Q`0-"F$$$:6XU\!>57`\7PDJ/(7;I(\?NE?O#5Q,'G:0X._-(<.25
M%;VG?I7S*A+\T9_`!%D.U*=#RVF*%P6B"ZZ7?T+U2K82BO+><]:Y>address@hidden
M$SU1O>SK]Z<;]$&address@hidden):-0,2Z7DPB/P-XHZC2-*/BIK@'BA3$RS'
MVB$O0%-,*,8D2<L[J(W#+&U\%\08P5S["BKWH:M!ECJ&>OK\',J$IEP&<M08
M)address@hidden,J@,-ZZ<6`UYGK3>#M_&2H?-:$L8'M([.I#Y;S1E/UEX-^P
M_"I8>7.:R$,#)*CQ)@,+8!R.IYMX>J<)address@hidden/DH`]RE%IJ-DV\M'H
MHH<T28"#LI<>ZB:address@hidden,LK"5GFG'.PO:(`=4"0G;Z4<)A/5"\F
MYL?F0JMF;[T"@,>?&address@hidden&2;FT32UNK!2E_\^1879`]'JJSO=9G
M=E.0[M953-?+AV?V)='NT%GXK%2J('N\"]-TP,C&GXID8J<N"K(=NK#`Z3K,
MOS494!BYTRC-0D1!AS00:B#5:address@hidden@K9#LMW:GP_(F'%,P!#'FON`%*A
MQM3"address@hidden"M7;#%NM)(=!M2*5<_PZ4`*:address@hidden
M)^G"<U::PL<address@hidden'^*8R[HZRA&D?):Y6UVUAK0O"FLKJQQFYV(O!VLH
M]T9L9+A(45D<address@hidden<address@hidden,4\GT`D:4TJO7"address@hidden
M-1FKS>7V"-P$3%/address@hidden&BN]M+#&8W>%4/JHZQ.P,\K9CE\ZA%`G#6+D<
M6#;4!Q>address@hidden@Z&Q%QKUH7D^)O3LP=K8:XR[$<DK)U/XQT9WLX+][U5(%
M_&,3I.)BQY7L.&SED^;:(T5MGR265GFWU$W6GBP-6U5,EFWT)V,=9IS%/IC_
M)D82WPO919[K31S0*3OYXW)_%/HEOC3M(address@hidden/LRN0?[CJI-G.;$IOSF)O
MCFV#4-W$=4#,J>R&@UZE"N-DZS\MU*E8\RGHDF>&].0I,3WY@:">/#6J)S\2
MUJO$CW=G6V>@X?^86,TU;A+-4G?ZSTV4EC3(4<;.8RL[2>K%:7EI!QKH(XS"
M&(@G8Z-EOM,X6`^B%'address@hidden<*,-=ZLPE#;A;!+<9</E6C^2UPGM
MR=F9_KG6SQ2GS:3FHK)IWAG8.H:address@hidden,D':8'D%P9TMO
MWKH-N_/^:\W&:UO-G.&*EZW02%R[I0LS+E8K7`QX^F>M=>#0G"]90'R!N9,5
M54+B<[XC$C^?1241UFXY3$:/;AELUL6&05E^4F*("_C(W`#\.^CSH$F?)PD]
M`[:F8PKZ/"U#YDLR)GAA6X,JRT)82(TQ=RDMVN!S&Q,(WJ8GL\&>-)HE,#",
MP*JVIXQMX1J:BB<%1I-1FR=?4C\=1>O-6IHH8+-O`49KE7Y+X^LHP1I]+E'J
MN^V]W`:5C9=/NG;9D&P4Q]>*YG=>\)address@hidden";!*7S$';<KZV0#%
MTG&address@hidden>_O]_;P[-,A&<419`#\I+3/3HEL8GZ&"?TS($(.
M\M:?S7MO]_"0TFC2-W25X*$Y$D-V[<(KHHS/[9^[>QU^LNZ(P#-6\>">_E'Q
M>.VQ2[#2&\C;CI"KD/*J?$EOZ5*<^R/L:/_A;,W/R4B7I%KN2$FW!O(3.-7K
M3.)($2'[*"4\[HQC8*/%BP3LWD!I".*D#CO=DY\8.R1D$(4'*1Y>(HL-H&S6
MY/J!>&'I&Q[(,HK6;address@hidden;address@hidden(Z0FT.29]0SQ\EP^F
M)!H\&'>RR\B&$-/PZQY"\FK*I$NG))O)C+^$'!\3*$P6WCJ13ZLAQW]_\7=^
M?4(`EKDX)J?YZ:4J#_N&EZ3$2R'>K%-V])(+X\Y+F'B/FL1;`R5HI_P+-XK)
address@hidden<P4XIS-"41%!L,)5'C+=;0G\A\X?N49Q/++&-!]+8
M9%1NSVV/PXQ(#C:+\+X9:address@hidden,"Z]]\V-<,O?\EAL>DILASR4.
MCO;C_>*PW$Z<Y#K`=#.,4H"%+(C`Y/`+?96)J>address@hidden(9OH?^''?O4+.AYW,
MHU#/7[`;<Z`#%5ES4=\MF(>address@hidden&7!>,9MD-Q2,80?6(-0QS^[I_I_C>
MF"-Q?CA_B$=].]6CQME;?P'L=]X=DB'>A&`7_#)address@hidden(9K<`R27%
M.Y$+NB+1)@5Y'X)`[]#6ETF$M_^Y<X%10H*,]1N:5W0#0XP(I+`K$J1OD>K=
address@hidden(9GN(7\A#O'B(>/BR9?TH,=F&9^\>8.CP-DO&KSD1R5A%&"Z
M["`S#)address@hidden<>,G?+W)address@hidden/address@hidden(2"
MGV_":\#;X^/WXD-.\)4=8L:GWPM(;DEE3HD-4QS,`BA=LWG!28CX72G<#R,0
MW"\A)?KM\D)address@hidden&/.(61S%9E]P4YS$YOK!#V'+O.*7^F37:?-+9GUORCH&
M-QE&Y#=FHZP+1E)PR\;"6$YN0*QK=(!X("O$Z[$IP;H+9Q]Z)6#M"W*"%XU6
address@hidden/*RL\PG\IPYJ#(X95[X`/H#J3P+76(]GTT=;]A5
address@hidden,address@hidden'H+:'QE&EU$F#6":Z^"L,!\.`[A'<\ZHS^9QU3O$P%
MNH[AC7!5SH_+L2&"address@hidden@4,:\X$@<'MF/RN#7I"PTJ3Q,X`=[FM]L0Y
M<I+=!"KFBC7++#L'>%$%R.?:7Q\Q(RC/M+\NE))_&P`?4+>;.Q4$ZJ';Z/7R
M`,@.(.>*6V=)N2R9P7,QU1M4=GLB,W-A5#DG[#W:RO'IUQ:3XKJ=V10_]RZX
M`_\&C^1#OZA)X([QT#_4*=J8^PF)"2`Y_AO3Q]S;RE+CKO(4`/*&address@hidden(
MLHOX10?0&IGO,'address@hidden&9)>9@/4G6XKM/Q&address@hidden,,J7NF6
M#``C'@address@hidden,address@hidden<ZP!>)5*(address@hidden/\!#NF`3%X]+
M[&'$ZN)E]%[E^DMV]Z4G1HZB*JJ5WR1!YWJ??>O988_U)6[-Y"address@hidden(Z
MH*2)-7('address@hidden<BBXU1O9Q:$WL<K?/9G-HELH
MTK).\6J1Z*Y[V&N0LMR7[`^06+:`+.7H\-?'I\QEB0ED5Y:R[Q'AEPV^B?^_
MY\3?6_G63>>)PA+,X)4F>/.>?:HH?3#C=0C_VC<N3^&CQ345-J\AY_6018E2
M*Q!2.*=3\-LVI#)0U;,F":XCSU"^/E:(.;6(9NSN[)1"4%A!N,$6;T63=[G\
MF/@$3OYE(*^FD-2_QM'D8FS0"address@hidden;U\6UXN5:4,(O)%RZ\W:8MRV:%C?@
MVCCXWT:NIJ=A&(:>MU_1XRK$'address@hidden:>+(address@hidden<M
M4P^;U,E)G<9UWO-LWS\^3>Z]\]4NRHV5>F]UT`"_WG%<IL;EOGVG=+8X+"KA
address@hidden>'address@hidden(<EDU3H'"*2[.EVW#-D9G(:L."!R%1.7L(9A1+5SWGK8QQ+
MWQ!.:ZNB7_*<TL!4X9TRAQS"$MZ^$LZ44=DKIK(7[<@%[O16<E2D/@Z-Y>XP
M4C"8KG+J1*C<6:2EUCGHMV"V7,<%Z5=)#+:<690+NOIUD7IPMQPJ")K!3"ZJ
M$?9Q=`$KIH)O!]O2"0'NEG'#!X&O,:.Z8NAIJ-L*$<O"V+/Y[6O):'[AIA&;
MBDAFZ6KW5^QJVA-.:*#8FO^6E\QK+CT5=D5]+L4TX.V`T,1=R7A,2?O?`XM;
MR\[NF0IDTOH]G'*F"!-39K@;S0!^.-+R,E7;CD;V0#DTKSD!#7*%GVHB(-_X
MW!(0[S^:address@hidden"QC8\6,R<940OF4`,]:S.'[*SP,QGOJ&LY331AA7R(SA_Q(
L%2UT?9.N.S^79G?&address@hidden/E$UO^?GZ,VRCF8WK<?T'Q0_'W%U6``!(
`
end