From 8f13f1c405aa7a7ba62add8eff3f7da79ebdec55 Mon Sep 17 00:00:00 2001 From: Mark Janssen Date: Wed, 20 Nov 2002 14:24:27 +0000 Subject: [PATCH] Removed visible FIXME's in --help output, cleaned up --help printing git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@51 bc163920-b10d-0410-b2c5-a5491ca2ceef --- cmdline.c | 39 +++++++++++++++++++++------------------ proxytunnel | Bin 21386 -> 21007 bytes 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/cmdline.c b/cmdline.c index f42eb4f..d4fa323 100755 --- a/cmdline.c +++ b/cmdline.c @@ -46,24 +46,27 @@ cmdline_parser_print_help (void) "Purpose:\n" " Build generic tunnels trough HTTPS proxy's, supports HTTP authorization\n" "\n" -"Usage: %s [OPTIONS]...\n\ - -h --help Print help and exit\n\ - -V --version Print version and exit\n\ - -c --config=FILE Read config options from file (FIXME)\n\ - -i --inetd Run from inetd (default=off)\n\ - -a INT --standalone=INT Run as standalone daemon on specified port\n\ - -f --nobackground Don't for to background in standalone mode (FIXME)\n\ - -u STRING --user=STRING Username to send to HTTPS proxy for auth\n\ - -s STRING --pass=STRING Password to send to HTTPS proxy for auth\n\ - -g STRING --proxyhost=STRING HTTPS Proxy host to connect to\n\ - -G INT --proxyport=INT HTTPS Proxy portnumber to connect to\n\ - -d STRING --desthost=STRING Destination host to built the tunnel to\n\ - -D INT --destport=INT Destination portnumber to built the tunnel to\n\ - -H STRING --header=STRING Add STRING to HTTP headers sent to proxy\n\ - -n --dottedquad Convert destination hostname to dotted quad\n\ - -v --verbose Turn on verbosity (default=off)\n\ - -q --quiet Suppress messages (default=off)\n\ -", PACKAGE); +"Usage: %s [OPTIONS]...\n" +" -h --help Print help and exit\n" +" -V --version Print version and exit\n" +#if 0 +" -c --config=FILE Read config options from file (FIXME)\n" +#endif +" -i --inetd Run from inetd (default=off)\n" +" -a INT --standalone=INT Run as standalone daemon on specified port\n" +#if 0 +" -f --nobackground Don't for to background in standalone mode (FIXME)\n" +#endif +" -u STRING --user=STRING Username to send to HTTPS proxy for auth\n" +" -s STRING --pass=STRING Password to send to HTTPS proxy for auth\n" +" -g STRING --proxyhost=STRING HTTPS Proxy host to connect to\n" +" -G INT --proxyport=INT HTTPS Proxy portnumber to connect to\n" +" -d STRING --desthost=STRING Destination host to built the tunnel to\n" +" -D INT --destport=INT Destination portnumber to built the tunnel to\n" +" -H STRING --header=STRING Add STRING to HTTP headers sent to proxy\n" +" -n --dottedquad Convert destination hostname to dotted quad\n" +" -v --verbose Turn on verbosity (default=off)\n" +" -q --quiet Suppress messages (default=off)\n", PACKAGE); printf( "\nExamples:\n" "%s [ -h | -V ]\n" diff --git a/proxytunnel b/proxytunnel index 917d5ca878804e9a758a671adc60dc83c4606356..c73d0c7964cc7582a55ac5f11699bd4d9a64ba8e 100755 GIT binary patch delta 8010 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 delta 8072 zcmc(ke^gZGnaAH5XY_`QFd*V23^E{y8h>D7Dk_>Wfs{0~9rLRu(TD+YvYBA_wzi@`}=v{d+&RnIpTQwCypjxT;PDqSR{lPSaC4(@f9Kuw>aGp!YhP> zlDcy)gJ-i-i1rB%F_C)Mfx@!{XP3+HbRB&2F_mz7N4Db$N8~`g%gBL4CeDAt*$iF| znS}FCINQL?n_P>MPJtI|W|hu^-`89R*$1AZ`S*}R;02o7AVHZ+7`?CfKFIUnRM==giL(zJ z)f|k#VF-#hw4xJo6#QMy#gLwc@gCR@_Ji#f&I8W{vt=wG17|*Xq2|kw#o#8CL;HTn zHQ*6#kIaRl0*aYh@z3C0;CD2KArFA<0;j^>435|KKFBt3p=QLJI2Gf6C-_+Rcn>Z_ z`n^A~Iew$)g2Qo_M_mom;yS$9?Tazh~trOdw0hk z_hZh;^YELPYYnM;iZzt(WUGR1%mU`)MwhlzBIt&@Tn2~y3MFD@gmMDPr({gPZxUvc zixSh#pqzyADGf|M${U18ri??d`FMjC`YAm^1T2HdqC}U@qD;V$Qlcw!DHDZQM2X(X zqnwH%rc4ncNI6Z20!qx5B1+7LV#=F^2vH*V9-#Ci*jMu=4KYADU5FCObRo(p144u; zGY}G#m=V>Km>o5gSwiff%tnY%B4+9+XJbeyF+}?*Z$ZdV&K07Ga=s7`)_)isiX`7} zqSM5qPoCZz6vBKLU21*{{b~LJReH4RG;CwHo9NuJ>>*s~JC@BsU=)hM{xKZc9E>n+ zgT0D5C}D=(V5edZPM9mlV7p?0Due^%NQ+XqsF+1XlVXF6s1Sp7iaq2!aNO zNgKn^2F~c!zkb4y~EW=)Mr(%X@*hg+xTt^P%Q_-Rnd#RX3Zc@CToJ+1#e1M!s zu2$UCeaPdFlwjcsKTz*7Ry`CxbI@g&FQc|s>aVKk9uMwkvGz1XPoVnyI%}L`y@>4k zt4;b)zD9JphfnL;6_=7)4cs+`T=i3V(;&url_r`eY6nj8;e<@$qGzszjRz6g<{wa> zvu>tF?L^n5E8pE|tkNl2H`(tn$)6*kgNVwfm zBzqIS=BSgY-dTVmeC{k^Fw*SSrrbYIrFozG4p*qiOgQCt!U0>VaEMc29qY;P=B@Y6kqg&3?*ebN@Q))0$h(K zEyDF;QaY~Jl5WFw{*?7d z1If8Jvq{U`UR-y(TPf=I?ZRY3bjtZt3p`d(AUv;xO}S_4<|5_t<{N)@&<2?^Ep4(Y&+d#!vq$~DXAcduOMOG9|<_W6BGgCO($MGs?r z;V519%2(jBU%us=gDH2-m+2ktMx_$=a-Lz-T8HJ_o3=)du*CDQn7Myu1_7=Wto$v^ zgobcCT+D}5G;=j-9fmR#{w1|ROMBK$9i8peDSzWQ&2qey!S%!{K)FP$%-&;WS5(Ek zts}@Mq)WL5gX$3TklnY|)XcW0rXOavyEm za{_6WKB)Dfz>7&%jVuKR?M+iQWLC=U89pXy%9v$&bdGxn%Ofu{g&v{I*}AY3R$==x z>#6t7(E6a(7tT=nURz(M_3kXCZ_3jCom&4(OCQS4WOg;#+pJdo5fhI zVWxdBHilqAsKgw44*dHCyg@~mU+9v79Dks(W~TKuGycA}0~t4&pAKMg?K<7DCMVk| zkLRV!Cuc`G#%4d~zy~4@DQ{WXaq*UQj=M?&_Azf>X;o$Urj5(*zNffQEAQK|zARv= z169>Eo2n|e1ib@x51zg{?7E}C~RRBmSzm^ZJo>hblZ-`=>jsl+jZU}6tD!ZO(N9VkY&W`WpKI4jfc+_S5 z`5$*i{*i?nA0CbT-`1ZzGOo)z>@s%zoxM}nGM>->+r#U0<|4*<1cllOcKq071b^f* zUd3taY}pc1v0i=u^H$666Xf?Qbn=zFK%^g0ts)Z_u1$xr;Mg3-%@1PuA@IL|>BplM z=fN1}#@kadyb-)RhQA7~iQzIKO2xNh6a{c7i{T>h!(a$?RN}fShPQ+7jp0q;U`+b; z;HAgq&|<#K&d6Kr9O#m3@}Bl^4-_VK$g6oR2}uXA7lkEQ>pG?_ZFI=2r2}$i{t5Yw z{7}cm{2FIAc08^hc$rd1HLmOrylsnJ^)6$V+;+!|8@N>)z|Kxk{^*YMTlv9Qg12tJ zN?~2>^iKhq9`7ci4t{m;tMkg?JEl)mJGpr>IhZ+-UvI_|nU7nwf4fAM;g&1Xg(dO; zZu@ZCw?v-6?Er2EmdHNb@-fr0RJvBqbhlvZu39cwIb)(1-=!{xT)i^WnY=>oS~+vF z|1KeV@oj;vB2gs&ZDp!^s2JN~@~xF;BWx4YVuIR|6M`+X7|p}MwpomiFdS@y#rOu~ zp?h_Lz=jqMwuEv5_oQ*yLooq6t322y$_Z*4P|Of)nWey19S%0nVr<#rXz7-DcRdy< z(Dg!&g7#R(*4TA+!j3M!ez?TtG5S}>q`wu+uW&j!Q17om+SPD~DS~0DKHRlE#7z}D z0~SyYgWXUE8oCqQsSBWeFPLBDe4TM%L;1Uq=VI(HfQMrED3~7u5UN7l-LyN(fsV@I zriy*oEy~p+!5(=7Mw?jy?#aKaJCYf&zz4KH?JRJ-0SRINY_AmT0d6Rd+r7eI`F1F< zz%j6W*cIaUt)=sbIL5p_Y**mGE(hcroKk{CnlNe`MB|IOIM*?yvxM zejG6B*yW4A#J~Cn7JG zR?HCXgu-5e9L@ys9WdXy%izbK4&1xv4uwl|GuWOyi6W9HjzYmM+zgq70^1?1ZU$pHfE^PH%pkK0NDxEdHrVsD{d4dcG-x_j3g#DwC5xY&%0Ge@ zr9g2C2^Q-FIbbdaR)+CnKKMNB?`wMy+y|bc`F`*ac!B0p@F=)nb1gXQ`!3^7NLFAk zBxB%3*dtUlLb2mnm+`MEfkzwyd!8Quv2+CNd(LIth|OmDzXbNfeoPne8h9?)uE5*i zd~lJr4}lpYuj~9j0~f=Nt@eoO!fD8O4HQ^w70(7UXg2Ev3&Gqt1i~IC7K1Bd{Oh^2QGn0u&F`#%I8g8v)Ze;e3-gai;{d%&ZxbH!xP9s+wBTt>tmvm;RWp|FSG z1lV4f*yXZ9sS40Aj-QuRt`SUfOl29#oM81Mgl&6S>RLPHgKWl?}JZ)ZT~hfzfnLnGXc+K)uQLX_7UJs@rIfWJ8Hzn($ZVkl~!%3 q#y3^jd{Mf-qGH{~Emf84@M*NQMwD)?*;Z3qUOvCHqxs%#6aN?SFuE)N