Indenting cleanup for all *.[ch] files, except htsparse.c (too ugly to be automatically indented for now) and /minizip/, /mmsrip/ (external files)

setup:
  indent -l80 -lc80 -nhnl -nut -bad -bap -bbo -br -brf -bli2 -brs -bls -br -ss -sai -pmt -nsaw -nsaf -nprs -i2 -ce -npsl -npcs -cs -sob -cdw -nbc -lp

logs:
indent: ./src/htsback.c:157: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1417: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1826: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1833: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:1981: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:2685: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:2747: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:2861: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:3128: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsback.c:3512: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:140: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:597: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:598: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htswizard.c:611: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:97: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:106: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:106: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:256: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:262: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscoremain.c:935: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:271: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:272: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:273: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:274: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:275: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:276: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:277: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:278: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:279: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:280: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:281: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:662: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/httrack.c:752: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:413: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:414: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:415: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:416: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:417: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:418: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:419: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:420: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:421: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:422: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsweb.c:423: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:188: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:507: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:508: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:509: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:510: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:511: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:512: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:580: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.c:581: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:115: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:246: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:247: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:248: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:249: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:250: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:251: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:314: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/proxy/proxytrack.h:315: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:151: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:158: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:161: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:166: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:174: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:177: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:188: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:243: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:245: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:248: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:257: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htstools.c:647: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsbauth.c:364: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsbauth.c:387: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscache.c:473: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsserver.h:112: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsserver.h:187: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsjava.c:312: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsjava.c:379: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsjava.c:407: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsjava.c:472: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsjava.c:483: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htslib.c:593: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:809: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1743: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1874: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1896: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:1984: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2085: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2604: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2605: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2606: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2607: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2608: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2609: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2672: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2673: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2906: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2928: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:2996: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:4802: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htslib.c:5353: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5354: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5355: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5357: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5429: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htslib.c:5435: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscore.c:208: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscore.c:277: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscore.c:279: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htscore.c:357: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htscore.c:394: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htscore.c:1544: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscore.c:3330: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscore.c:3361: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htshash.c:140: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htshash.c:217: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsname.c:733: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsname.c:749: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsname.c:933: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsname.c:1520: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htszlib.c:76: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htszlib.c:81: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htscatchurl.c:268: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsinthash.c:156: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:159: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:176: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:179: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:226: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsinthash.c:253: Warning:old style assignment ambiguity in "=&".  Assuming "= &"
indent: ./src/htsftp.c:169: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsftp.c:177: Warning:old style assignment ambiguity in "=-".  Assuming "= -"
indent: ./src/htsfilters.c:67: Warning:old style assignment ambiguity in "=*".  Assuming "= *"
indent: ./src/htsfilters.c:80: Warning:old style assignment ambiguity in "=*".  Assuming "= *"

1 files changed, 354 insertions, 315 deletions

diff --git a/src/htsalias.c b/src/htsalias.c
index 908bc13..1a55a86 100644
--- a/src/htsalias.c
+++ b/src/htsalias.c
@@ -17,18 +17,15 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
 Important notes:
 
 - We hereby ask people using this source NOT to use it in purpose of grabbing
 emails addresses, or collecting any other private information on persons.
 This would disgrace our work, and spoil the many hours we spent on it.
 
-
 Please visit our Website: http://www.httrack.com
 */
 
-
 /* ------------------------------------------------------------ */
 /* File: htsalias.c subroutines:                                */
 /*       alias for command-line options and config files        */
@@ -42,8 +39,8 @@ Please visit our Website: http://www.httrack.com
 #include "htsalias.h"
 #include "htsglobal.h"
 
-void linput(FILE* fp,char* s,int max);
-void hts_lowcase(char* s);
+void linput(FILE * fp, char *s, int max);
+void hts_lowcase(char *s);
 
 #define _NOT_NULL(a) ( (a!=NULL) ? (a) : "" )
 // #define is_realspace(c) (strchr(" \x0d\x0a\x09\x0b\x0c",(c))!=NULL)
@@ -70,7 +67,6 @@ void hts_lowcase(char* s);
   argc++
 // END OF COPY OF cmdl_ins in htsmain.c
 
-
 /*
   Aliases for command-line and config file definitions
   These definitions can be used:
@@ -90,174 +86,193 @@ void hts_lowcase(char* s);
   param1 : this option must be alone, and needs one distinct parameter (-P <path>)
   param0 : this option must be alone, but the parameter should be put together (+*.gif)
 */
-const char* hts_optalias[][4] = {
+const char *hts_optalias[][4] = {
   /*   {"","","",""}, */
-  {"path","-O","param1","output path"},
-  {"chroot","-%O","param1","default top path"},
-  {"mirror","-w","single",""},
-  {"mirror-wizard","-W","single",""},
-  {"get-files","-g","single",""},
-  {"quiet","-q","single",""},
-  {"mirrorlinks","-Y","single",""},
-  {"proxy","-P","param1","proxy name:port"},
-  {"bind","-%b","param1","hostname to bind"},
-  {"httpproxy-ftp","-%f","param",""},
-  {"depth","-r","param",""},{"recurse-levels","-r","param",""},
-  {"ext-depth","-%e","param",""},
-  {"max-files","-m","param",""},
-  {"max-size","-M","param",""},
-  {"max-time","-E","param",""},
-  {"max-mms-time","-%m","param",""},
-  {"max-rate","-A","param",""},
-  {"max-pause","-G","param",""},
-  {"sockets","-c","param","number of simultaneous connections allowed"},{"socket","-c","param","number of simultaneous connections allowed"},{"connection","-c","param","number of simultaneous connections allowed"},
-  {"connection-per-second","-%c","param","number of connection per second allowed"},
-  {"timeout","-T","",""},
-  {"retries","-R","param","number of retries for non-fatal errors"},
-  {"min-rate","-J","param",""},
-  {"host-control","-H","param",""},
-  {"extended-parsing","-%P","param",""},
-  {"near","-n","single",""},
-  {"delayed-type-check","-%N","single",""},
-  {"cached-delayed-type-check","-%D","single",""},
-  {"delayed-type-check-always","-%N2","single",""},
-  {"disable-security-limits","-%!","single",""},
-  {"test","-t","single",""},
-  {"list","-%L","param1",""},
-  {"urllist","-%S","param1",""},
-  {"language","-%l","param1",""}, {"lang","-%l","param1",""},
-  {"structure","-N","param",""}, {"user-structure","-N","param1",""},
-  {"long-names","-L","param",""},
-  {"keep-links","-K","param",""},
-  {"mime-html","-%M","single",""}, {"mht","-%M","single",""},
-  {"replace-external","-x","single",""},
-  {"disable-passwords","-%x","single",""},{"disable-password","-%x","single",""},
-  {"include-query-string","-%q","single",""},
-  {"generate-errors","-o","single",""},
-  {"do-not-generate-errors","-o0","single",""},
-  {"purge-old","-X","param",""},
-  {"cookies","-b","param",""},
-  {"check-type","-u","param",""},
-  {"assume","-%A","param1",""}, {"mimetype","-%A","param1",""},
-  {"parse-java","-j","param",""},
-  {"protocol","-@i","param",""},
-  {"robots","-s","param",""},
-  {"http-10","-%h","single",""},{"http-1.0","-%h","single",""},
-  {"keep-alive","-%k","single",""},
-  {"build-top-index","-%i","single",""},
-  {"disable-compression","-%z","single",""},
-  {"tolerant","-%B","single",""},
-  {"updatehack","-%s","single",""}, {"sizehack","-%s","single",""},
-  {"urlhack","-%u","single",""},
-  {"user-agent","-F","param1","user-agent identity"},
-  {"referer","-%R","param1","default referer URL"},
-  {"from","-%E","param1","from email address"},
-  {"footer","-%F","param1",""},
-  {"cache","-C","param","number of retries for non-fatal errors"},
-  {"store-all-in-cache","-k","single",""},
-  {"do-not-recatch","-%n","single",""},
-  {"do-not-log","-Q","single",""},
-  {"extra-log","-z","single",""},
-  {"debug-log","-Z","single",""},
-  {"verbose","-v","single",""},
-  {"file-log","-f","single",""},
-  {"single-log","-f2","single",""},
-  {"index","-I","single",""},
-  {"search-index","-%I","single",""},
-  {"priority","-p","param",""},
-  {"debug-headers","-%H","single",""},
-  {"userdef-cmd","-V","param1",""},
-  {"callback","-%W","param1","plug an external callback"}, {"wrapper","-%W","param1","plug an external callback"},
-  {"structure","-N","param1","user-defined structure"},
-  {"usercommand","-V","param1","user-defined command"},
-  {"display","-%v","single","show files transfered and other funny realtime information"},
-  {"dos83","-L0","single",""},
-  {"iso9660","-L2","single",""},
-  {"disable-module","-%w","param1",""},
-  {"no-background-on-suspend","-y0","single",""},
-  {"background-on-suspend","-y","single",""},
-  {"utf8-conversion","-%T","single",""},
-  {"no-utf8-conversion","-%T0","single",""},
+  {"path", "-O", "param1", "output path"},
+  {"chroot", "-%O", "param1", "default top path"},
+  {"mirror", "-w", "single", ""},
+  {"mirror-wizard", "-W", "single", ""},
+  {"get-files", "-g", "single", ""},
+  {"quiet", "-q", "single", ""},
+  {"mirrorlinks", "-Y", "single", ""},
+  {"proxy", "-P", "param1", "proxy name:port"},
+  {"bind", "-%b", "param1", "hostname to bind"},
+  {"httpproxy-ftp", "-%f", "param", ""},
+  {"depth", "-r", "param", ""}, {"recurse-levels", "-r", "param", ""},
+  {"ext-depth", "-%e", "param", ""},
+  {"max-files", "-m", "param", ""},
+  {"max-size", "-M", "param", ""},
+  {"max-time", "-E", "param", ""},
+  {"max-mms-time", "-%m", "param", ""},
+  {"max-rate", "-A", "param", ""},
+  {"max-pause", "-G", "param", ""},
+  {"sockets", "-c", "param", "number of simultaneous connections allowed"},
+    {"socket", "-c", "param", "number of simultaneous connections allowed"},
+    {"connection", "-c", "param", "number of simultaneous connections allowed"},
+  {"connection-per-second", "-%c", "param",
+   "number of connection per second allowed"},
+  {"timeout", "-T", "", ""},
+  {"retries", "-R", "param", "number of retries for non-fatal errors"},
+  {"min-rate", "-J", "param", ""},
+  {"host-control", "-H", "param", ""},
+  {"extended-parsing", "-%P", "param", ""},
+  {"near", "-n", "single", ""},
+  {"delayed-type-check", "-%N", "single", ""},
+  {"cached-delayed-type-check", "-%D", "single", ""},
+  {"delayed-type-check-always", "-%N2", "single", ""},
+  {"disable-security-limits", "-%!", "single", ""},
+  {"test", "-t", "single", ""},
+  {"list", "-%L", "param1", ""},
+  {"urllist", "-%S", "param1", ""},
+  {"language", "-%l", "param1", ""}, {"lang", "-%l", "param1", ""},
+  {"structure", "-N", "param", ""}, {"user-structure", "-N", "param1", ""},
+  {"long-names", "-L", "param", ""},
+  {"keep-links", "-K", "param", ""},
+  {"mime-html", "-%M", "single", ""}, {"mht", "-%M", "single", ""},
+  {"replace-external", "-x", "single", ""},
+  {"disable-passwords", "-%x", "single", ""}, {"disable-password", "-%x",
+                                               "single", ""},
+  {"include-query-string", "-%q", "single", ""},
+  {"generate-errors", "-o", "single", ""},
+  {"do-not-generate-errors", "-o0", "single", ""},
+  {"purge-old", "-X", "param", ""},
+  {"cookies", "-b", "param", ""},
+  {"check-type", "-u", "param", ""},
+  {"assume", "-%A", "param1", ""}, {"mimetype", "-%A", "param1", ""},
+  {"parse-java", "-j", "param", ""},
+  {"protocol", "-@i", "param", ""},
+  {"robots", "-s", "param", ""},
+  {"http-10", "-%h", "single", ""}, {"http-1.0", "-%h", "single", ""},
+  {"keep-alive", "-%k", "single", ""},
+  {"build-top-index", "-%i", "single", ""},
+  {"disable-compression", "-%z", "single", ""},
+  {"tolerant", "-%B", "single", ""},
+  {"updatehack", "-%s", "single", ""}, {"sizehack", "-%s", "single", ""},
+  {"urlhack", "-%u", "single", ""},
+  {"user-agent", "-F", "param1", "user-agent identity"},
+  {"referer", "-%R", "param1", "default referer URL"},
+  {"from", "-%E", "param1", "from email address"},
+  {"footer", "-%F", "param1", ""},
+  {"cache", "-C", "param", "number of retries for non-fatal errors"},
+  {"store-all-in-cache", "-k", "single", ""},
+  {"do-not-recatch", "-%n", "single", ""},
+  {"do-not-log", "-Q", "single", ""},
+  {"extra-log", "-z", "single", ""},
+  {"debug-log", "-Z", "single", ""},
+  {"verbose", "-v", "single", ""},
+  {"file-log", "-f", "single", ""},
+  {"single-log", "-f2", "single", ""},
+  {"index", "-I", "single", ""},
+  {"search-index", "-%I", "single", ""},
+  {"priority", "-p", "param", ""},
+  {"debug-headers", "-%H", "single", ""},
+  {"userdef-cmd", "-V", "param1", ""},
+  {"callback", "-%W", "param1", "plug an external callback"}, {"wrapper", "-%W",
+                                                               "param1",
+                                                               "plug an external callback"},
+  {"structure", "-N", "param1", "user-defined structure"},
+  {"usercommand", "-V", "param1", "user-defined command"},
+  {"display", "-%v", "single",
+   "show files transfered and other funny realtime information"},
+  {"dos83", "-L0", "single", ""},
+  {"iso9660", "-L2", "single", ""},
+  {"disable-module", "-%w", "param1", ""},
+  {"no-background-on-suspend", "-y0", "single", ""},
+  {"background-on-suspend", "-y", "single", ""},
+  {"utf8-conversion", "-%T", "single", ""},
+  {"no-utf8-conversion", "-%T0", "single", ""},
   /* */
 
   /* DEPRECATED */
-  {"stay-on-same-dir","-S","single","stay on the same directory - DEPRECATED"},
-  {"can-go-down","-D","single","can only go down into subdirs - DEPRECATED"},
-  {"can-go-up","-U","single","can only go to upper directories- DEPRECATED"},
-  {"can-go-up-and-down","-B","single","can both go up&down into the directory structure - DEPRECATED"},
-  {"stay-on-same-address","-a","single","stay on the same address - DEPRECATED"},
-  {"stay-on-same-domain","-d","single","stay on the same principal domain - DEPRECATED"},
-  {"stay-on-same-tld","-l","single","stay on the same TLD (eg: .com) - DEPRECATED"},
-  {"go-everywhere","-e","single","go everywhere on the web - DEPRECATED"},
+  {"stay-on-same-dir", "-S", "single",
+   "stay on the same directory - DEPRECATED"},
+  {"can-go-down", "-D", "single", "can only go down into subdirs - DEPRECATED"},
+  {"can-go-up", "-U", "single", "can only go to upper directories- DEPRECATED"},
+  {"can-go-up-and-down", "-B", "single",
+   "can both go up&down into the directory structure - DEPRECATED"},
+  {"stay-on-same-address", "-a", "single",
+   "stay on the same address - DEPRECATED"},
+  {"stay-on-same-domain", "-d", "single",
+   "stay on the same principal domain - DEPRECATED"},
+  {"stay-on-same-tld", "-l", "single",
+   "stay on the same TLD (eg: .com) - DEPRECATED"},
+  {"go-everywhere", "-e", "single", "go everywhere on the web - DEPRECATED"},
 
   /* Badly documented */
-  {"debug-testfilters","-#0","param1","debug: test filters"},
-  {"advanced-flushlogs","-#f","single",""},
-  {"advanced-maxfilters","-#F","param",""},
-  {"version","-#h","single",""},
-  {"debug-scanstdin","-#K","single",""},
-  {"advanced-maxlinks","-#L","single",""},
-  {"advanced-progressinfo","-#p","single","deprecated"},
-  {"catch-url","-#P","single","catch complex URL through proxy"},
-  /*{"debug-oldftp","-#R","single",""},*/
-  {"debug-xfrstats","-#T","single",""},
-  {"advanced-wait","-#u","single",""},
-  {"debug-ratestats","-#Z","single",""},
-  {"exec","-#!","param1",""},
-  {"fast-engine","-#X","single","Enable fast routines"},
-  {"debug-overflows","-#X0","single","Attempt to detect buffer overflows"},
-  {"debug-cache","-#C","param1","List files in the cache"},
-  {"extract-cache","-#C","single","Extract meta-data"},
-  {"debug-parsing","-#d","single","debug: test parser"},
-  {"repair-cache","-#R","single","repair the damaged cache ZIP file"}, {"repair","-#R","single",""},
+  {"debug-testfilters", "-#0", "param1", "debug: test filters"},
+  {"advanced-flushlogs", "-#f", "single", ""},
+  {"advanced-maxfilters", "-#F", "param", ""},
+  {"version", "-#h", "single", ""},
+  {"debug-scanstdin", "-#K", "single", ""},
+  {"advanced-maxlinks", "-#L", "single", ""},
+  {"advanced-progressinfo", "-#p", "single", "deprecated"},
+  {"catch-url", "-#P", "single", "catch complex URL through proxy"},
+  /*{"debug-oldftp","-#R","single",""}, */
+  {"debug-xfrstats", "-#T", "single", ""},
+  {"advanced-wait", "-#u", "single", ""},
+  {"debug-ratestats", "-#Z", "single", ""},
+  {"exec", "-#!", "param1", ""},
+  {"fast-engine", "-#X", "single", "Enable fast routines"},
+  {"debug-overflows", "-#X0", "single", "Attempt to detect buffer overflows"},
+  {"debug-cache", "-#C", "param1", "List files in the cache"},
+  {"extract-cache", "-#C", "single", "Extract meta-data"},
+  {"debug-parsing", "-#d", "single", "debug: test parser"},
+  {"repair-cache", "-#R", "single", "repair the damaged cache ZIP file"},
+    {"repair", "-#R", "single", ""},
 
   /* STANDARD ALIASES */
-  {"spider","-p0C0I0t","single",""},
-  {"testsite","-p0C0I0t","single",""},
-  {"testlinks","-r1p0C0I0t","single",""}, {"test","-r1p0C0I0t","single",""}, {"bookmark","-r1p0C0I0t","single",""},
-  {"mirror","-w","single",""},
-  {"testscan","-p0C0I0Q","single",""}, {"scan","-p0C0I0Q","single",""}, {"check","-p0C0I0Q","single",""},
-  {"skeleton","-p1","single",""},
-  {"preserve","-%p","single",""},
-  {"get","-qg","single",""},
-  {"update","-iC2","single",""},
-  {"continue","-iC1","single",""}, {"restart","-iC1","single",""},
-  {"continue","-i","single",""}, /* for help alias */
-  {"sucker","-r999","single",""},
-  {"help","-h","single",""}, {"documentation","-h","single",""}, {"doc","-h","single",""},
-  {"wide","-c32","single",""},
-  {"tiny","-c1","single",""},
-  {"ultrawide","-c48","single",""},
-  {"http10","-%h","single",""},
-  {"filelist","-%L","single",""}, {"list","-%L","single",""},
-  {"filterlist","-%S","single",""},
+  {"spider", "-p0C0I0t", "single", ""},
+  {"testsite", "-p0C0I0t", "single", ""},
+  {"testlinks", "-r1p0C0I0t", "single", ""}, {"test", "-r1p0C0I0t", "single",
+                                              ""}, {"bookmark", "-r1p0C0I0t",
+                                                    "single", ""},
+  {"mirror", "-w", "single", ""},
+  {"testscan", "-p0C0I0Q", "single", ""}, {"scan", "-p0C0I0Q", "single", ""},
+    {"check", "-p0C0I0Q", "single", ""},
+  {"skeleton", "-p1", "single", ""},
+  {"preserve", "-%p", "single", ""},
+  {"get", "-qg", "single", ""},
+  {"update", "-iC2", "single", ""},
+  {"continue", "-iC1", "single", ""}, {"restart", "-iC1", "single", ""},
+  {"continue", "-i", "single", ""},     /* for help alias */
+  {"sucker", "-r999", "single", ""},
+  {"help", "-h", "single", ""}, {"documentation", "-h", "single", ""}, {"doc",
+                                                                        "-h",
+                                                                        "single",
+                                                                        ""},
+  {"wide", "-c32", "single", ""},
+  {"tiny", "-c1", "single", ""},
+  {"ultrawide", "-c48", "single", ""},
+  {"http10", "-%h", "single", ""},
+  {"filelist", "-%L", "single", ""}, {"list", "-%L", "single", ""},
+  {"filterlist", "-%S", "single", ""},
   /* END OF ALIASES */
 
   /* Filters */
-  {"allow","+","param0","allow filter"},
-  {"deny","-","param0","deny filter"},
+  {"allow", "+", "param0", "allow filter"},
+  {"deny", "-", "param0", "deny filter"},
   /* */
 
   /* URLs */
-  {"add","","param0","add URLs"},
+  {"add", "", "param0", "add URLs"},
   /* */
 
   /* Specific */
-  {"user","-%U","param1","output path"},
+  {"user", "-%U", "param1", "output path"},
   /* */
 
   /* Internal */
-  {"catchurl","--catchurl","single","catch complex URL through proxy"},
-  {"updatehttrack","--updatehttrack","single","update HTTrack Website Copier"},
-  {"clean","--clean","single","clean up log files and cache"},
-  {"tide","--clean","single","clean up log files and cache"},
-  {"autotest","-#T","single",""},
+  {"catchurl", "--catchurl", "single", "catch complex URL through proxy"},
+  {"updatehttrack", "--updatehttrack", "single",
+   "update HTTrack Website Copier"},
+  {"clean", "--clean", "single", "clean up log files and cache"},
+  {"tide", "--clean", "single", "clean up log files and cache"},
+  {"autotest", "-#T", "single", ""},
   /* */
 
-  {"","","",""}
+  {"", "", "", ""}
 };
 
-
 /* 
   Check for alias in command-line 
   argc,argv     as in main()
@@ -267,139 +282,146 @@ const char* hts_optalias[][4] = {
 
   return value: number of arguments treated (0 if error)
 */
-int optalias_check(int argc,const char * const * argv,int n_arg,
-                   int* return_argc,char** return_argv,
-                   char* return_error) {
-  return_error[0]='\0';
-  *return_argc=1;
-  if (argv[n_arg][0]=='-')
-  if (argv[n_arg][1]=='-') {
-    char command[1000];
-    char param[1000];
-    char addcommand[256];
-    /* */
-    char* position;
-    int need_param=1;
-    //int return_param=0;
-    int pos;
-    command[0]=param[0]=addcommand[0]='\0';
-
-    /* --sockets=8 */
-    if ( (position=strchr(argv[n_arg],'=')) ) {
-      /* Copy command */
-      strncatbuff(command,argv[n_arg]+2,(int) (position - (argv[n_arg]+2)) );
-      /* Copy parameter */
-      strcpybuff(param,position+1);
-    }
-    /* --nocache */
-    else if (strncmp(argv[n_arg]+2,"no",2)==0) {
-      strcpybuff(command,argv[n_arg]+4);
-      strcpybuff(param,"0");
-    }
-    /* --sockets 8 */
-    else {
-      if (strncmp(argv[n_arg]+2,"wide-",5)==0) {
-        strcpybuff(addcommand,"c32");
-        strcpybuff(command,strchr(argv[n_arg]+2,'-')+1);
-      } else if (strncmp(argv[n_arg]+2,"tiny-",5)==0) {
-        strcpybuff(addcommand,"c1");
-        strcpybuff(command,strchr(argv[n_arg]+2,'-')+1);
-      } else
-        strcpybuff(command,argv[n_arg]+2);
-      need_param=2;
-    }
+int optalias_check(int argc, const char *const *argv, int n_arg,
+                   int *return_argc, char **return_argv, char *return_error) {
+  return_error[0] = '\0';
+  *return_argc = 1;
+  if (argv[n_arg][0] == '-')
+    if (argv[n_arg][1] == '-') {
+      char command[1000];
+      char param[1000];
+      char addcommand[256];
+
+      /* */
+      char *position;
+      int need_param = 1;
+
+      //int return_param=0;
+      int pos;
+
+      command[0] = param[0] = addcommand[0] = '\0';
+
+      /* --sockets=8 */
+      if ((position = strchr(argv[n_arg], '='))) {
+        /* Copy command */
+        strncatbuff(command, argv[n_arg] + 2,
+                    (int) (position - (argv[n_arg] + 2)));
+        /* Copy parameter */
+        strcpybuff(param, position + 1);
+      }
+      /* --nocache */
+      else if (strncmp(argv[n_arg] + 2, "no", 2) == 0) {
+        strcpybuff(command, argv[n_arg] + 4);
+        strcpybuff(param, "0");
+      }
+      /* --sockets 8 */
+      else {
+        if (strncmp(argv[n_arg] + 2, "wide-", 5) == 0) {
+          strcpybuff(addcommand, "c32");
+          strcpybuff(command, strchr(argv[n_arg] + 2, '-') + 1);
+        } else if (strncmp(argv[n_arg] + 2, "tiny-", 5) == 0) {
+          strcpybuff(addcommand, "c1");
+          strcpybuff(command, strchr(argv[n_arg] + 2, '-') + 1);
+        } else
+          strcpybuff(command, argv[n_arg] + 2);
+        need_param = 2;
+      }
 
-    /* Now solve the alias */
-    pos=optalias_find(command);
-    if (pos>=0) {
-      /* Copy real name */
-      strcpybuff(command,hts_optalias[pos][1]);
-      /* With parameters? */
-      if (strncmp(hts_optalias[pos][2],"param",5)==0) {
-        /* Copy parameters? */
-        if (need_param == 2) {
-          if ((n_arg+1>=argc) || (argv[n_arg+1][0]=='-')) {  /* no supplemental parameter */
-            sprintf(return_error,
-              "Syntax error:\n\tOption %s needs to be followed by a parameter: %s <param>\n\t%s\n",
-              command,command,_NOT_NULL(optalias_help(command)));
-            return 0;
+      /* Now solve the alias */
+      pos = optalias_find(command);
+      if (pos >= 0) {
+        /* Copy real name */
+        strcpybuff(command, hts_optalias[pos][1]);
+        /* With parameters? */
+        if (strncmp(hts_optalias[pos][2], "param", 5) == 0) {
+          /* Copy parameters? */
+          if (need_param == 2) {
+            if ((n_arg + 1 >= argc) || (argv[n_arg + 1][0] == '-')) {   /* no supplemental parameter */
+              sprintf(return_error,
+                      "Syntax error:\n\tOption %s needs to be followed by a parameter: %s <param>\n\t%s\n",
+                      command, command, _NOT_NULL(optalias_help(command)));
+              return 0;
+            }
+            strcpybuff(param, argv[n_arg + 1]);
+            need_param = 2;
           }
-          strcpybuff(param,argv[n_arg+1]);
-          need_param=2;
+        } else
+          need_param = 1;
+
+        /* Final result */
+
+        /* Must be alone (-P /tmp) */
+        if (strcmp(hts_optalias[pos][2], "param1") == 0) {
+          strcpybuff(return_argv[0], command);
+          strcpybuff(return_argv[1], param);
+          *return_argc = 2;     /* 2 parameters returned */
         }
-      } else
-        need_param=1;
-
-      /* Final result */
-
-      /* Must be alone (-P /tmp) */
-      if (strcmp(hts_optalias[pos][2],"param1")==0) {
-        strcpybuff(return_argv[0],command);
-        strcpybuff(return_argv[1],param);
-        *return_argc=2;     /* 2 parameters returned */
-      } 
-      /* Alone with parameter (+*.gif) */
-      else if (strcmp(hts_optalias[pos][2],"param0")==0) {
-        /* Command */
-        strcpybuff(return_argv[0],command);
-        strcatbuff(return_argv[0],param);
-      }
-      /* Together (-c8) */
-      else {
-        /* Command */
-        strcpybuff(return_argv[0],command);
-        /* Parameters accepted */
-        if (strncmp(hts_optalias[pos][2],"param",5)==0) {
-          /* --cache=off or --index=on */
-          if (strcmp(param,"off")==0)
-            strcatbuff(return_argv[0],"0");
-          else if (strcmp(param,"on")==0) {
-            // on is the default
-            // strcatbuff(return_argv[0],"1");
-          } else
-            strcatbuff(return_argv[0],param);
+        /* Alone with parameter (+*.gif) */
+        else if (strcmp(hts_optalias[pos][2], "param0") == 0) {
+          /* Command */
+          strcpybuff(return_argv[0], command);
+          strcatbuff(return_argv[0], param);
         }
-        *return_argc=1;     /* 1 parameter returned */
+        /* Together (-c8) */
+        else {
+          /* Command */
+          strcpybuff(return_argv[0], command);
+          /* Parameters accepted */
+          if (strncmp(hts_optalias[pos][2], "param", 5) == 0) {
+            /* --cache=off or --index=on */
+            if (strcmp(param, "off") == 0)
+              strcatbuff(return_argv[0], "0");
+            else if (strcmp(param, "on") == 0) {
+              // on is the default
+              // strcatbuff(return_argv[0],"1");
+            } else
+              strcatbuff(return_argv[0], param);
+          }
+          *return_argc = 1;     /* 1 parameter returned */
+        }
+      } else {
+        sprintf(return_error, "Unknown option: %s\n", command);
+        return 0;
       }
-    } else {
-      sprintf(return_error,"Unknown option: %s\n",command);
-      return 0;
+      return need_param;
     }
-    return need_param;
-  }
 
   /* Check -O <path> */
   {
     int pos;
-    if ((pos=optreal_find(argv[n_arg]))>=0) {
-      if ( (strcmp(hts_optalias[pos][2],"param1")==0) || (strcmp(hts_optalias[pos][2],"param0")==0)) {
-        if ((n_arg+1>=argc) || (argv[n_arg+1][0]=='-')) {  /* no supplemental parameter */
+
+    if ((pos = optreal_find(argv[n_arg])) >= 0) {
+      if ((strcmp(hts_optalias[pos][2], "param1") == 0)
+          || (strcmp(hts_optalias[pos][2], "param0") == 0)) {
+        if ((n_arg + 1 >= argc) || (argv[n_arg + 1][0] == '-')) {       /* no supplemental parameter */
           sprintf(return_error,
-            "Syntax error:\n\tOption %s needs to be followed by a parameter: %s <param>\n\t%s\n",
-            argv[n_arg],argv[n_arg],_NOT_NULL(optalias_help(argv[n_arg])));
+                  "Syntax error:\n\tOption %s needs to be followed by a parameter: %s <param>\n\t%s\n",
+                  argv[n_arg], argv[n_arg],
+                  _NOT_NULL(optalias_help(argv[n_arg])));
           return 0;
         }
         /* Copy parameters */
-        strcpybuff(return_argv[0],argv[n_arg]);
-        strcpybuff(return_argv[1],argv[n_arg+1]);
+        strcpybuff(return_argv[0], argv[n_arg]);
+        strcpybuff(return_argv[1], argv[n_arg + 1]);
         /* And return */
-        *return_argc=2;     /* 2 parameters returned */
-        return 2;           /* 2 parameters used */
+        *return_argc = 2;       /* 2 parameters returned */
+        return 2;               /* 2 parameters used */
       }
     }
   }
-  
+
   /* Copy and return other unknown option */
-  strcpybuff(return_argv[0],argv[n_arg]);
+  strcpybuff(return_argv[0], argv[n_arg]);
   return 1;
 }
 
 /* Finds the <token> option alias and returns the index, or -1 if failed */
-int optalias_find(const char* token) {
+int optalias_find(const char *token) {
   if (token[0] != '\0') {
-    int i=0;
+    int i = 0;
+
     while(hts_optalias[i][0][0] != '\0') {
-      if (strcmp(token,hts_optalias[i][0])==0) {
+      if (strcmp(token, hts_optalias[i][0]) == 0) {
         return i;
       }
       i++;
@@ -409,11 +431,12 @@ int optalias_find(const char* token) {
 }
 
 /* Finds the <token> real option and returns the index, or -1 if failed */
-int optreal_find(const char* token) {
+int optreal_find(const char *token) {
   if (token[0] != '\0') {
-    int i=0;
+    int i = 0;
+
     while(hts_optalias[i][0][0] != '\0') {
-      if (strcmp(token,hts_optalias[i][1])==0) {
+      if (strcmp(token, hts_optalias[i][1]) == 0) {
         return i;
       }
       i++;
@@ -422,23 +445,24 @@ int optreal_find(const char* token) {
   return -1;
 }
 
-const char* optreal_value(int p) {
+const char *optreal_value(int p) {
   return hts_optalias[p][1];
 }
-const char* optalias_value(int p) {
+const char *optalias_value(int p) {
   return hts_optalias[p][0];
 }
-const char* opttype_value(int p) {
+const char *opttype_value(int p) {
   return hts_optalias[p][2];
 }
-const char* opthelp_value(int p) {
+const char *opthelp_value(int p) {
   return hts_optalias[p][3];
 }
 
 /* Help for option <token>, empty if not available, or NULL if unknown <token> */
-const char* optalias_help(const char* token) {
-  int pos=optalias_find(token);
-  if (pos>=0)
+const char *optalias_help(const char *token) {
+  int pos = optalias_find(token);
+
+  if (pos >= 0)
     return hts_optalias[pos][3];
   else
     return NULL;
@@ -452,76 +476,89 @@ const char* optalias_help(const char* token) {
   deny ad.*
 */
 /* Note: NOT utf-8 */
-int optinclude_file(const char* name,
-                    int* argc,char** argv,char* x_argvblk,int* x_ptr) {
-  FILE* fp;
-  fp=fopen(name,"rb");
+int optinclude_file(const char *name, int *argc, char **argv, char *x_argvblk,
+                    int *x_ptr) {
+  FILE *fp;
+
+  fp = fopen(name, "rb");
   if (fp) {
     char line[256];
-    int insert_after=1;       /* first, insert after program filename */
+    int insert_after = 1;       /* first, insert after program filename */
+
     while(!feof(fp)) {
-      char *a,*b;
+      char *a, *b;
       int result;
-      
+
       /* read line */
-      linput(fp,line,250);
+      linput(fp, line, 250);
       hts_lowcase(line);
       if (strnotempty(line)) {
         /* no comment line: # // ; */
-        if (strchr("#/;",line[0])==NULL) {
+        if (strchr("#/;", line[0]) == NULL) {
           /* right trim */
-          a=line+strlen(line)-1;
-          while(is_realspace(*a)) *(a--) = '\0';
+          a = line + strlen(line) - 1;
+          while(is_realspace(*a))
+            *(a--) = '\0';
           /* jump "set " and spaces */
-          a=line;
-          while(is_realspace(*a)) a++;
-          if (strncmp(a,"set",3)==0) {
-            if (is_realspace(*(a+3))) {
-              a+=4;
+          a = line;
+          while(is_realspace(*a))
+            a++;
+          if (strncmp(a, "set", 3) == 0) {
+            if (is_realspace(*(a + 3))) {
+              a += 4;
             }
           }
-          while(is_realspace(*a)) a++;
+          while(is_realspace(*a))
+            a++;
           /* delete = ("sockets=8") */
-          if ( (b=strchr(a,'=')) )
-            *b=' ';
-          
+          if ((b = strchr(a, '=')))
+            *b = ' ';
+
           /* isolate option and parameter */
-          b=a;
-          while( (!is_realspace(*b)) && (*b) ) b++;
+          b = a;
+          while((!is_realspace(*b)) && (*b))
+            b++;
           if (*b) {
-            *b='\0';
+            *b = '\0';
             b++;
           }
           /* a is now the option, b the parameter */
-          
+
           {
             int return_argc;
             char return_error[256];
-            char  _tmp_argv[4][HTS_CDLMAXSIZE];
-            char*  tmp_argv[4];
-            tmp_argv[0]=_tmp_argv[0]; tmp_argv[1]=_tmp_argv[1]; tmp_argv[2]=_tmp_argv[2]; tmp_argv[3]=_tmp_argv[3];
-            strcpybuff(tmp_argv[0],"--");
-            strcatbuff(tmp_argv[0],a);
-            strcpybuff(tmp_argv[1],b);
-            
-            result=optalias_check(2,(const char * const *)tmp_argv,0,
-              &return_argc,(tmp_argv+2),
-              return_error);
+            char _tmp_argv[4][HTS_CDLMAXSIZE];
+            char *tmp_argv[4];
+
+            tmp_argv[0] = _tmp_argv[0];
+            tmp_argv[1] = _tmp_argv[1];
+            tmp_argv[2] = _tmp_argv[2];
+            tmp_argv[3] = _tmp_argv[3];
+            strcpybuff(tmp_argv[0], "--");
+            strcatbuff(tmp_argv[0], a);
+            strcpybuff(tmp_argv[1], b);
+
+            result =
+              optalias_check(2, (const char *const *) tmp_argv, 0, &return_argc,
+                             (tmp_argv + 2), return_error);
             if (!result) {
-              printf("%s\n",return_error);
+              printf("%s\n", return_error);
             } else {
               int insert_after_argc;
+
               /* Insert parameters BUT so that they can be in the same order */
               /* temporary argc: Number of parameters after minus insert_after_argc */
-              insert_after_argc=(*argc)-insert_after;
-              cmdl_ins((tmp_argv[2]),insert_after_argc,(argv+insert_after),x_argvblk,(*x_ptr));
-              *argc=insert_after_argc+insert_after;
+              insert_after_argc = (*argc) - insert_after;
+              cmdl_ins((tmp_argv[2]), insert_after_argc, (argv + insert_after),
+                       x_argvblk, (*x_ptr));
+              *argc = insert_after_argc + insert_after;
               insert_after++;
               /* Second one */
-              if (return_argc>1) {
-                insert_after_argc=(*argc)-insert_after;
-                cmdl_ins((tmp_argv[3]),insert_after_argc,(argv+insert_after),x_argvblk,(*x_ptr));
-                *argc=insert_after_argc+insert_after;
+              if (return_argc > 1) {
+                insert_after_argc = (*argc) - insert_after;
+                cmdl_ins((tmp_argv[3]), insert_after_argc,
+                         (argv + insert_after), x_argvblk, (*x_ptr));
+                *argc = insert_after_argc + insert_after;
                 insert_after++;
               }
               /* increment to nbr of used parameters */
@@ -529,7 +566,7 @@ int optinclude_file(const char* name,
             }
           }
         }
-        
+
       }
     }
     fclose(fp);
@@ -540,9 +577,10 @@ int optinclude_file(const char* name,
 
 /* Get home directory, '.' if failed */
 /* example: /home/smith */
-char* hts_gethome(void) {
+char *hts_gethome(void) {
 #ifndef _WIN32_WCE
-  char* home = getenv( "HOME" );
+  char *home = getenv("HOME");
+
   if (home)
     return home;
   else
@@ -551,9 +589,10 @@ char* hts_gethome(void) {
 }
 
 /* Convert ~/foo into /home/smith/foo */
-void expand_home(String *str) {
+void expand_home(String * str) {
   if (StringSub(*str, 1) == '~') {
-    char BIGSTK tempo[HTS_URLMAXSIZE*2];
+    char BIGSTK tempo[HTS_URLMAXSIZE * 2];
+
     strcpybuff(tempo, hts_gethome());
     strcatbuff(tempo, StringBuff(*str) + 1);
     StringCopy(*str, tempo);