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, 227 insertions, 186 deletions

diff --git a/src/htsbauth.c b/src/htsbauth.c
index 3f04c9b..2d469e5 100644
--- a/src/htsbauth.c
+++ b/src/htsbauth.c
@@ -16,18 +16,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: httrack.c subroutines:                                 */
 /*       basic authentication: password storage                 */
@@ -48,73 +45,82 @@ Please visit our Website: http://www.httrack.com
 // gestion des cookie
 // ajoute, dans l'ordre
 // !=0 : erreur
-int cookie_add(t_cookie* cookie,char* cook_name,char* cook_value,char* domain,char* path) {
-	char buffer[8192];
-  char* a=cookie->data;
-  char* insert;
+int cookie_add(t_cookie * cookie, char *cook_name, char *cook_value,
+               char *domain, char *path) {
+  char buffer[8192];
+  char *a = cookie->data;
+  char *insert;
   char cook[16384];
+
   // effacer éventuel cookie en double
-  cookie_del(cookie,cook_name,domain,path);
-  if ((int)strlen(cook_value)>1024) return -1;                              // trop long
-  if ((int)strlen(cook_name)>256) return -1;                                // trop long
-  if ((int)strlen(domain)>256) return -1;                                   // trop long
-  if ((int)strlen(path)>256) return -1;                                     // trop long
-  if ((int)(
-    strlen(cookie->data)
-    +strlen(cook_value)
-    +strlen(cook_name)
-    +strlen(domain)
-    +strlen(path)
-    +256
-    ) > cookie->max_len) return -1;               // impossible d'ajouter
-
-  insert=a;          // insérer ici
-  while (*a) {
-    if ( strlen(cookie_get(buffer, a,2)) <  strlen(path) )      // long. path (le + long est prioritaire)
-      a=cookie->data+strlen(cookie->data);    // fin
+  cookie_del(cookie, cook_name, domain, path);
+  if ((int) strlen(cook_value) > 1024)
+    return -1;                  // trop long
+  if ((int) strlen(cook_name) > 256)
+    return -1;                  // trop long
+  if ((int) strlen(domain) > 256)
+    return -1;                  // trop long
+  if ((int) strlen(path) > 256)
+    return -1;                  // trop long
+  if ((int) (strlen(cookie->data)
+             + strlen(cook_value)
+             + strlen(cook_name)
+             + strlen(domain)
+             + strlen(path)
+             + 256) > cookie->max_len)
+    return -1;                  // impossible d'ajouter
+
+  insert = a;                   // insérer ici
+  while(*a) {
+    if (strlen(cookie_get(buffer, a, 2)) < strlen(path))        // long. path (le + long est prioritaire)
+      a = cookie->data + strlen(cookie->data);  // fin
     else {
-      a=strchr(a,'\n');     // prochain champ
-      if (a==NULL)
-        a=cookie->data+strlen(cookie->data);    // fin
+      a = strchr(a, '\n');      // prochain champ
+      if (a == NULL)
+        a = cookie->data + strlen(cookie->data);        // fin
       else
         a++;
-      while(*a=='\n') a++;
-      insert=a;          // insérer ici
+      while(*a == '\n')
+        a++;
+      insert = a;               // insérer ici
     }
   }
   // construction du cookie
-  strcpybuff(cook,domain);
-  strcatbuff(cook,"\t");
-  strcatbuff(cook,"TRUE");
-  strcatbuff(cook,"\t");
-  strcatbuff(cook,path);
-  strcatbuff(cook,"\t");
-  strcatbuff(cook,"FALSE");
-  strcatbuff(cook,"\t");
-  strcatbuff(cook,"1999999999");
-  strcatbuff(cook,"\t");
-  strcatbuff(cook,cook_name);
-  strcatbuff(cook,"\t");
-  strcatbuff(cook,cook_value);
-  strcatbuff(cook,"\n");
-  if (!( ((int) strlen(cookie->data) + (int) strlen(cook)) < cookie->max_len)) return -1;      // impossible d'ajouter
-  cookie_insert(insert,cook);
+  strcpybuff(cook, domain);
+  strcatbuff(cook, "\t");
+  strcatbuff(cook, "TRUE");
+  strcatbuff(cook, "\t");
+  strcatbuff(cook, path);
+  strcatbuff(cook, "\t");
+  strcatbuff(cook, "FALSE");
+  strcatbuff(cook, "\t");
+  strcatbuff(cook, "1999999999");
+  strcatbuff(cook, "\t");
+  strcatbuff(cook, cook_name);
+  strcatbuff(cook, "\t");
+  strcatbuff(cook, cook_value);
+  strcatbuff(cook, "\n");
+  if (!(((int) strlen(cookie->data) + (int) strlen(cook)) < cookie->max_len))
+    return -1;                  // impossible d'ajouter
+  cookie_insert(insert, cook);
 #if DEBUG_COOK
-  printf("add_new cookie: name=\"%s\" value=\"%s\" domain=\"%s\" path=\"%s\"\n",cook_name,cook_value,domain,path);
+  printf("add_new cookie: name=\"%s\" value=\"%s\" domain=\"%s\" path=\"%s\"\n",
+         cook_name, cook_value, domain, path);
   //printf(">>>cook: %s<<<\n",cookie->data);
 #endif
   return 0;
 }
 
 // effacer cookie si existe
-int cookie_del(t_cookie* cookie,char* cook_name,char* domain,char* path) {
-  char *a,*b;
-  b=cookie_find(cookie->data,cook_name,domain,path);
+int cookie_del(t_cookie * cookie, char *cook_name, char *domain, char *path) {
+  char *a, *b;
+
+  b = cookie_find(cookie->data, cook_name, domain, path);
   if (b) {
-    a=cookie_nextfield(b);
-    cookie_delete(b,(int) (a - b));
+    a = cookie_nextfield(b);
+    cookie_delete(b, (int) (a - b));
 #if DEBUG_COOK
-    printf("deleted old cookie: %s %s %s\n",cook_name,domain,path);
+    printf("deleted old cookie: %s %s %s\n", cook_name, domain, path);
 #endif
   }
   return 0;
@@ -123,100 +129,112 @@ int cookie_del(t_cookie* cookie,char* cook_name,char* domain,char* path) {
 // rechercher cookie à partir de la position s (par exemple s=cookie.data)
 // renvoie pointeur sur ligne, ou NULL si introuvable
 // path est aligné à droite et cook_name peut être vide (chercher alors tout cookie)
-// .doubleclick.net	TRUE	/	FALSE	1999999999	id	A
-char* cookie_find(char* s,char* cook_name,char* domain,char* path) {
-	char buffer[8192];
-  char* a=s;
-  while (*a) {
+// .doubleclick.net     TRUE    /       FALSE   1999999999      id      A
+char *cookie_find(char *s, char *cook_name, char *domain, char *path) {
+  char buffer[8192];
+  char *a = s;
+
+  while(*a) {
     int t;
-    if (strnotempty(cook_name)==0)
-      t=1;                      // accepter par défaut
+
+    if (strnotempty(cook_name) == 0)
+      t = 1;                    // accepter par défaut
     else
-      t=( strcmp(cookie_get(buffer, a,5),cook_name)==0 );     // tester si même nom
-    if (t) {  // même nom ou nom qualconque
+      t = (strcmp(cookie_get(buffer, a, 5), cook_name) == 0);   // tester si même nom
+    if (t) {                    // même nom ou nom qualconque
       //
-      char* chk_dom=cookie_get(buffer,a,0);       // domaine concerné par le cookie
+      char *chk_dom = cookie_get(buffer, a, 0); // domaine concerné par le cookie
+
       if ((int) strlen(chk_dom) <= (int) strlen(domain)) {
-        if ( strcmp(chk_dom,domain+strlen(domain)-strlen(chk_dom))==0 ) {  // même domaine
+        if (strcmp(chk_dom, domain + strlen(domain) - strlen(chk_dom)) == 0) {  // même domaine
           //
-          char* chk_path=cookie_get(buffer,a,2);       // chemin concerné par le cookie
+          char *chk_path = cookie_get(buffer, a, 2);    // chemin concerné par le cookie
+
           if ((int) strlen(chk_path) <= (int) strlen(path)) {
-            if (strncmp(path,chk_path,strlen(chk_path))==0 ) { // même chemin
+            if (strncmp(path, chk_path, strlen(chk_path)) == 0) {       // même chemin
               return a;
             }
           }
         }
       }
     }
-    a=cookie_nextfield(a);
+    a = cookie_nextfield(a);
   }
   return NULL;
 }
 
 // renvoie prochain champ
-char* cookie_nextfield(char* a) {
-  char* b=a;
-  a=strchr(a,'\n');     // prochain champ
-  if (a==NULL)
-    a=b+strlen(b);    // fin
+char *cookie_nextfield(char *a) {
+  char *b = a;
+
+  a = strchr(a, '\n');          // prochain champ
+  if (a == NULL)
+    a = b + strlen(b);          // fin
   else
     a++;
-  while(*a=='\n') a++;
+  while(*a == '\n')
+    a++;
   return a;
 }
 
 // lire cookies.txt
 // lire également (Windows seulement) les *@*.txt (cookies IE copiés)
 // !=0 : erreur
-int cookie_load(t_cookie* cookie, const char* fpath, const char* name) {
-	char catbuff[CATBUFF_SIZE];
-	char buffer[8192];
- //  cookie->data[0]='\0';
+int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
+  char catbuff[CATBUFF_SIZE];
+  char buffer[8192];
+
+  //  cookie->data[0]='\0';
 
   // Fusionner d'abord les éventuels cookies IE
 #ifdef _WIN32
   {
     WIN32_FIND_DATAA find;
     HANDLE h;
-    char  pth[MAX_PATH + 32];
-    strcpybuff(pth,fpath);
-    strcatbuff(pth,"*@*.txt");
-    h = FindFirstFileA((char*)pth,&find);
+    char pth[MAX_PATH + 32];
+
+    strcpybuff(pth, fpath);
+    strcatbuff(pth, "*@*.txt");
+    h = FindFirstFileA((char *) pth, &find);
     if (h != INVALID_HANDLE_VALUE) {
       do {
-        if (!(find.dwFileAttributes  & FILE_ATTRIBUTE_DIRECTORY ))
-          if (!(find.dwFileAttributes  & FILE_ATTRIBUTE_SYSTEM )) {
-            FILE* fp=fopen(fconcat(catbuff, fpath, find.cFileName),"rb");
+        if (!(find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+          if (!(find.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) {
+            FILE *fp = fopen(fconcat(catbuff, fpath, find.cFileName), "rb");
+
             if (fp) {
               char cook_name[256];
               char cook_value[1000];
               char domainpathpath[512];
               char dummy[512];
+
               //
-              char domain[256];           // domaine cookie (.netscape.com)
-              char path[256];             // chemin (/)
-              int cookie_merged=0;
+              char domain[256]; // domaine cookie (.netscape.com)
+              char path[256];   // chemin (/)
+              int cookie_merged = 0;
+
               //
               // Read all cookies
-              while( ! feof(fp) ) {
-                cook_name[0] = cook_value[0] = domainpathpath[0] 
+              while(!feof(fp)) {
+                cook_name[0] = cook_value[0] = domainpathpath[0]
                   = dummy[0] = domain[0] = path[0] = '\0';
-                linput(fp,cook_name,250);
-                if ( ! feof(fp) ) {
-                  linput(fp,cook_value,250);
-                  if ( ! feof(fp) )  {
+                linput(fp, cook_name, 250);
+                if (!feof(fp)) {
+                  linput(fp, cook_value, 250);
+                  if (!feof(fp)) {
                     int i;
-                    linput(fp,domainpathpath,500);
+
+                    linput(fp, domainpathpath, 500);
                     /* Read 6 other useless values */
-                    for(i = 0 ; ! feof(fp) && i < 6 ; i++) {
-                      linput(fp,dummy,500);
+                    for(i = 0; !feof(fp) && i < 6; i++) {
+                      linput(fp, dummy, 500);
                     }
-                    if (strnotempty(cook_name) 
-                      && strnotempty(cook_value) 
-                      && strnotempty(domainpathpath)) {
-                      if (ident_url_absolute(domainpathpath,domain,path)>=0) {
-                        cookie_add(cookie,cook_name,cook_value,domain,path);
-                        cookie_merged=1;
+                    if (strnotempty(cook_name)
+                        && strnotempty(cook_value)
+                        && strnotempty(domainpathpath)) {
+                      if (ident_url_absolute(domainpathpath, domain, path) >= 0) {
+                        cookie_add(cookie, cook_name, cook_value, domain, path);
+                        cookie_merged = 1;
                       }
                     }
                   }
@@ -224,37 +242,40 @@ int cookie_load(t_cookie* cookie, const char* fpath, const char* name) {
               }
               fclose(fp);
               if (cookie_merged)
-                remove(fconcat(catbuff,fpath,find.cFileName));
-            }  // if fp
+                remove(fconcat(catbuff, fpath, find.cFileName));
+            }                   // if fp
           }
-      } while(FindNextFileA(h,&find));
+      } while(FindNextFileA(h, &find));
       FindClose(h);
     }
   }
 #endif
-  
+
   // Ensuite, cookies.txt
   {
-    FILE* fp = fopen(fconcat(catbuff, fpath, name),"rb");
+    FILE *fp = fopen(fconcat(catbuff, fpath, name), "rb");
+
     if (fp) {
       char BIGSTK line[8192];
-      while( (!feof(fp)) && (((int) strlen(cookie->data)) < cookie->max_len)) {
-        rawlinput(fp,line,8100);
+
+      while((!feof(fp)) && (((int) strlen(cookie->data)) < cookie->max_len)) {
+        rawlinput(fp, line, 8100);
         if (strnotempty(line)) {
-          if (strlen(line)<8000) {
-            if (line[0]!='#') {
-              char domain[256];           // domaine cookie (.netscape.com)
-              char path[256];             // chemin (/)
-              char cook_name[1024];       // nom cookie (MYCOOK)
-              char BIGSTK cook_value[8192];      // valeur (ID=toto,S=1234)
-              strcpybuff(domain,cookie_get(buffer,line,0));       // host
-              strcpybuff(path,cookie_get(buffer,line,2));         // path
-              strcpybuff(cook_name,cookie_get(buffer,line,5));    // name
-              strcpybuff(cook_value,cookie_get(buffer,line,6));   // value
+          if (strlen(line) < 8000) {
+            if (line[0] != '#') {
+              char domain[256]; // domaine cookie (.netscape.com)
+              char path[256];   // chemin (/)
+              char cook_name[1024];     // nom cookie (MYCOOK)
+              char BIGSTK cook_value[8192];     // valeur (ID=toto,S=1234)
+
+              strcpybuff(domain, cookie_get(buffer, line, 0));  // host
+              strcpybuff(path, cookie_get(buffer, line, 2));    // path
+              strcpybuff(cook_name, cookie_get(buffer, line, 5));       // name
+              strcpybuff(cook_value, cookie_get(buffer, line, 6));      // value
 #if DEBUG_COOK
-              printf("%s\n",line);
+              printf("%s\n", line);
 #endif
-              cookie_add(cookie,cook_name,cook_value,domain,path);
+              cookie_add(cookie, cook_name, cook_value, domain, path);
             }
           }
         }
@@ -268,17 +289,22 @@ int cookie_load(t_cookie* cookie, const char* fpath, const char* name) {
 
 // écrire cookies.txt
 // !=0 : erreur
-int cookie_save(t_cookie* cookie,char* name) {
-	char catbuff[CATBUFF_SIZE];
+int cookie_save(t_cookie * cookie, char *name) {
+  char catbuff[CATBUFF_SIZE];
+
   if (strnotempty(cookie->data)) {
     char BIGSTK line[8192];
-    FILE* fp = fopen(fconv(catbuff,name),"wb");
+    FILE *fp = fopen(fconv(catbuff, name), "wb");
+
     if (fp) {
-      char* a=cookie->data;
-      fprintf(fp,"# HTTrack Website Copier Cookie File"LF"# This file format is compatible with Netscape cookies"LF);
+      char *a = cookie->data;
+
+      fprintf(fp,
+              "# HTTrack Website Copier Cookie File" LF
+              "# This file format is compatible with Netscape cookies" LF);
       do {
-        a+=binput(a,line,8000);
-        fprintf(fp,"%s"LF,line);
+        a += binput(a, line, 8000);
+        fprintf(fp, "%s" LF, line);
       } while(strnotempty(line));
       fclose(fp);
       return 0;
@@ -289,30 +315,33 @@ int cookie_save(t_cookie* cookie,char* name) {
 }
 
 // insertion chaine ins avant s
-void cookie_insert(char* s,char* ins) {
-  char* buff;
-  if (strnotempty(s)==0) {    // rien à faire, juste concat
-    strcatbuff(s,ins);
+void cookie_insert(char *s, char *ins) {
+  char *buff;
+
+  if (strnotempty(s) == 0) {    // rien à faire, juste concat
+    strcatbuff(s, ins);
   } else {
-    buff=(char*) malloct(strlen(s)+2);
+    buff = (char *) malloct(strlen(s) + 2);
     if (buff) {
-      strcpybuff(buff,s);     // copie temporaire
-      strcpybuff(s,ins);      // insérer
-      strcatbuff(s,buff);     // copier
+      strcpybuff(buff, s);      // copie temporaire
+      strcpybuff(s, ins);       // insérer
+      strcatbuff(s, buff);      // copier
       freet(buff);
     }
   }
 }
+
 // destruction chaine dans s position pos
-void cookie_delete(char* s,int pos) {
-  char* buff;
-  if (strnotempty(s+pos)==0) {    // rien à faire, effacer
-    s[0]='\0';
+void cookie_delete(char *s, int pos) {
+  char *buff;
+
+  if (strnotempty(s + pos) == 0) {      // rien à faire, effacer
+    s[0] = '\0';
   } else {
-    buff=(char*) malloct(strlen(s+pos)+2);
+    buff = (char *) malloct(strlen(s + pos) + 2);
     if (buff) {
-      strcpybuff(buff,s+pos);     // copie temporaire
-      strcpybuff(s,buff);         // copier
+      strcpybuff(buff, s + pos);        // copie temporaire
+      strcpybuff(s, buff);      // copier
       freet(buff);
     }
   }
@@ -320,28 +349,34 @@ void cookie_delete(char* s,int pos) {
 
 // renvoie champ param de la chaine cookie_base
 // ex: cookie_get("ceci est<tab>un<tab>exemple",1) renvoi "un"
-char* cookie_get(char *buffer,char* cookie_base,int param) {
-  char * limit;
+char *cookie_get(char *buffer, char *cookie_base, int param) {
+  char *limit;
 
-  while(*cookie_base=='\n') cookie_base++;
-  limit = strchr(cookie_base,'\n');
-  if (!limit) limit=cookie_base+strlen(cookie_base);
+  while(*cookie_base == '\n')
+    cookie_base++;
+  limit = strchr(cookie_base, '\n');
+  if (!limit)
+    limit = cookie_base + strlen(cookie_base);
   if (limit) {
     if (param) {
       int i;
-      for(i=0;i<param;i++) {
+
+      for(i = 0; i < param; i++) {
         if (cookie_base) {
-          cookie_base=strchr(cookie_base,'\t');       // prochain tab
-          if (cookie_base) cookie_base++;
+          cookie_base = strchr(cookie_base, '\t');      // prochain tab
+          if (cookie_base)
+            cookie_base++;
         }
       }
     }
     if (cookie_base) {
-      if ( cookie_base < limit) {
-        char* a = cookie_base;
-        while( (*a) && (*a!='\t') && (*a!='\n')) a++;
-        buffer[0]='\0';
-        strncatbuff(buffer,cookie_base,(int) (a - cookie_base));
+      if (cookie_base < limit) {
+        char *a = cookie_base;
+
+        while((*a) && (*a != '\t') && (*a != '\n'))
+          a++;
+        buffer[0] = '\0';
+        strncatbuff(buffer, cookie_base, (int) (a - cookie_base));
         return buffer;
       } else
         return "";
@@ -350,28 +385,29 @@ char* cookie_get(char *buffer,char* cookie_base,int param) {
   } else
     return "";
 }
-// fin cookies
-
 
+// fin cookies
 
 // -- basic auth --
 
 /* déclarer un répertoire comme possédant une authentification propre */
-int bauth_add(t_cookie* cookie,char* adr,char* fil,char* auth) {
-  char buffer[HTS_URLMAXSIZE*2];
-	if (cookie) {
-    if (!bauth_check(cookie,adr,fil)) {       // n'existe pas déja
-      bauth_chain* chain=&cookie->auth;
-      char* prefix=bauth_prefix(buffer,adr,fil);
+int bauth_add(t_cookie * cookie, char *adr, char *fil, char *auth) {
+  char buffer[HTS_URLMAXSIZE * 2];
+
+  if (cookie) {
+    if (!bauth_check(cookie, adr, fil)) {       // n'existe pas déja
+      bauth_chain *chain = &cookie->auth;
+      char *prefix = bauth_prefix(buffer, adr, fil);
+
       /* fin de la chaine */
       while(chain->next)
-        chain=chain->next;
-      chain->next=(bauth_chain*) calloc(sizeof(bauth_chain),1);
+        chain = chain->next;
+      chain->next = (bauth_chain *) calloc(sizeof(bauth_chain), 1);
       if (chain->next) {
-        chain=chain->next;
-        chain->next=NULL;
-        strcpybuff(chain->auth,auth);
-        strcpybuff(chain->prefix,prefix);
+        chain = chain->next;
+        chain->next = NULL;
+        strcpybuff(chain->auth, auth);
+        strcpybuff(chain->prefix, prefix);
         return 1;
       }
     }
@@ -381,33 +417,38 @@ int bauth_add(t_cookie* cookie,char* adr,char* fil,char* auth) {
 
 /* tester adr et fil, et retourner authentification si nécessaire */
 /* sinon, retourne NULL */
-char* bauth_check(t_cookie* cookie,char* adr,char* fil) {
-  char buffer[HTS_URLMAXSIZE*2];
+char *bauth_check(t_cookie * cookie, char *adr, char *fil) {
+  char buffer[HTS_URLMAXSIZE * 2];
+
   if (cookie) {
-    bauth_chain* chain=&cookie->auth;
-    char* prefix=bauth_prefix(buffer,adr,fil);
+    bauth_chain *chain = &cookie->auth;
+    char *prefix = bauth_prefix(buffer, adr, fil);
+
     while(chain) {
       if (strnotempty(chain->prefix)) {
-        if (strncmp(prefix,chain->prefix,strlen(chain->prefix))==0) {
+        if (strncmp(prefix, chain->prefix, strlen(chain->prefix)) == 0) {
           return chain->auth;
         }
       }
-      chain=chain->next;
+      chain = chain->next;
     }
   }
   return NULL;
 }
 
-char* bauth_prefix(char *prefix,char* adr,char* fil) {
-  char* a;
-  strcpybuff(prefix,jump_identification(adr));
-  strcatbuff(prefix,fil);
-  a=strchr(prefix,'?');
-  if (a) *a='\0';
-  if (strchr(prefix,'/')) {
-    a=prefix+strlen(prefix)-1;
-    while(*a != '/') a--;
-    *(a+1)='\0';
+char *bauth_prefix(char *prefix, char *adr, char *fil) {
+  char *a;
+
+  strcpybuff(prefix, jump_identification(adr));
+  strcatbuff(prefix, fil);
+  a = strchr(prefix, '?');
+  if (a)
+    *a = '\0';
+  if (strchr(prefix, '/')) {
+    a = prefix + strlen(prefix) - 1;
+    while(*a != '/')
+      a--;
+    *(a + 1) = '\0';
   }
   return prefix;
 }