@@ -72,6 +72,7 @@ Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>

 Robert Hogan <robert*roberthogan.net>

 James F.  Hranicky <jfh*cise.ufl.edu>

 Andy Igoshin <ai*vsu.ru>

+Jesper Juhl <juhl*dif.dk>

 Nicholas M. Kirsch <nick*kirsch.org>

 Robbert Kouprie <robbert*exx.nl>

 Martin Kraft <martin.kraft*fal.de>

@@ -1,3 +1,8 @@

+Mon Mar  8 01:24:37 CET 2004 (tk)

+---------------------------------

+  * applied comments cleanup (C89) patch (global) from Jesper Juhl

+    <juhl*dif.dk>

+

 Mon Mar  8 00:33:17 CET 2004 (tk)

 ---------------------------------

   * clamd: fixed QUIT/SHUTDOWN command - break blocking accept() to allow

@@ -143,8 +143,7 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 				    fprintf(stderr, "ERROR: Parse error at line %d: Option %s requires string as argument.\n", line, name);

 				    return NULL;

 				}

-				// FIXME: this one is an ugly hack of the above

-				// case

+				/* FIXME: this one is an ugly hack of the above case */

 				free(arg);

 				arg = strstr(buff, " ");

 				arg = strdup(++arg);

@@ -49,7 +49,9 @@ int localserver(const struct optstruct *opt, const struct cfgstruct *copt, struc

     if((sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

-	//fprintf(stderr, "ERROR: socket() error: %s\n", estr);

+	/* 

+	fprintf(stderr, "ERROR: socket() error: %s\n", estr);

+	*/

 	logg("!Socket allocation error: %s\n", estr);

 	exit(1);

     }

@@ -95,7 +97,9 @@ int localserver(const struct optstruct *opt, const struct cfgstruct *copt, struc

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

-	//fprintf(stderr, "ERROR: listen() error: %s\n", estr);

+	/*

+	fprintf(stderr, "ERROR: listen() error: %s\n", estr);

+	*/

 	logg("!listen() error: %s\n", estr);

 	exit(1);

     }

@@ -64,7 +64,9 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

-	//fprintf(stderr, "ERROR: socket() error: %s\n", estr);

+	/*

+	fprintf(stderr, "ERROR: socket() error: %s\n", estr);

+	*/

 	logg("!socket() error: %s\n", estr);

 	exit(1);

     }

@@ -75,7 +77,9 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) == -1) {

 	estr = strerror(errno);

-	//fprintf(stderr, "ERROR: can't bind(): %s\n", estr);

+	/* 

+	fprintf(stderr, "ERROR: can't bind(): %s\n", estr);

+	*/

 	logg("!bind() error: %s\n", estr);

 	exit(1);

     } else {

@@ -94,7 +98,9 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     if(listen(sockfd, backlog) == -1) {

 	estr = strerror(errno);

-	//fprintf(stderr, "ERROR: listen() error: %s\n", estr);

+	/*

+	fprintf(stderr, "ERROR: listen() error: %s\n", estr);

+	*/

 	logg("!listen() error: %s\n", estr);

 	exit(1);

     }

@@ -99,7 +99,7 @@ void clamscan(struct optstruct *opt)

     gettimeofday(&t1, &tz);

     ret = client(opt);

-//Implement STATUS in clamd

+/* Implement STATUS in clamd */

     if(!optl(opt, "disable-summary")) {

 	gettimeofday(&t2, &tz);

 	ds = t2.tv_sec - t1.tv_sec;

@@ -302,7 +302,7 @@ int ole2_read_block(int fd, ole2_header_t *hdr, void *buff, int32_t blockno)

 		return FALSE;

 	}

-	// other methods: (blockno+1) * 512 or (blockno * block_size) + 512;

+	/* other methods: (blockno+1) * 512 or (blockno * block_size) + 512; */

 	offset = (blockno << hdr->log2_big_block_size) + 512;	/* 512 is header size */

 	if (lseek(fd, offset, SEEK_SET) != offset) {

 		return FALSE;

@@ -421,7 +421,7 @@ int32_t ole2_get_sbat_data_block(int fd, ole2_header_t *hdr, void *buff, int32_t

 		return FALSE;

 	}

-	block_count = sbat_index / 8;			// 8 small blocks per big block

+	block_count = sbat_index / 8;			/* 8 small blocks per big block */

 	current_block = hdr->sbat_root_start;

 	while (block_count > 0) {

 		current_block = ole2_get_next_block_number(fd, hdr, current_block);

@@ -503,7 +503,7 @@ int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const char *

 	char *name, *newname;

 	if (prop->type != 2) {

-		// Not a file

+		/* Not a file */

 		return TRUE;

 	}

@@ -538,13 +538,13 @@ int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const char *

 	while((current_block >= 0) && (len > 0)) {

 		if (prop->size < hdr->sbat_cutoff) {

-			// Small block file

+			/* Small block file */

 			if (!ole2_get_sbat_data_block(fd, hdr, &buff, current_block)) {

 				cli_dbgmsg("ole2_get_sbat_data_block failed\n");

 				close(ofd);

 				return FALSE;

 			}

-			// buff now contains the block with 8 small blocks in it

+			/* buff now contains the block with 8 small blocks in it */

 			offset = 64 * (current_block % 8);

 			if (writen(ofd, &buff[offset], MIN(len,64)) != MIN(len,64)) {

 				close(ofd);

@@ -554,7 +554,7 @@ int handler_writefile(int fd, ole2_header_t *hdr, property_t *prop, const char *

 			len -= MIN(len,64);

 			current_block = ole2_get_next_sbat_block(fd, hdr, current_block);

 		} else {

-			// Big block file

+			/* Big block file */

 			if (!ole2_read_block(fd, hdr, &buff, current_block)) {

 				close(ofd);

 				return FALSE;

@@ -192,7 +192,9 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 		    fclose(fd);

 		    return ret;

 		}

-//		cli_dbgmsg("Added part %d of partial signature (id %d)\n", i, sigid);

+/*

+		cli_dbgmsg("Added part %d of partial signature (id %d)\n", i, sigid);

+*/

 		free(pt2);

 	    }

@@ -418,9 +418,11 @@ int urarlib_get(void *output,

   if (ArcPtr!=NULL){

       /* FIXME: possible FILE* leak */

       cli_dbgmsg("%s:%d NOT Close ArcPtr from fd %d\n", __FILE__, __LINE__, desc);

-      // fclose(ArcPtr);

-      // lseek(desc, 0, SEEK_SET);

-      // ArcPtr = NULL;

+      /*

+      fclose(ArcPtr);

+      lseek(desc, 0, SEEK_SET);

+      ArcPtr = NULL;

+      */

   }

 #endif

@@ -1814,66 +1816,66 @@ static void DecodeNumber(struct Decode *Deco)

  __asm {

     xor eax, eax

-    mov eax, BitField                       // N=BitField & 0xFFFE;

+    mov eax, BitField                       /* N=BitField & 0xFFFE; */

     and eax, 0xFFFFFFFE

     mov [N], eax

-    mov edx, [Deco]                         // EAX=N, EDX=Deco

+    mov edx, [Deco]                         /* EAX=N, EDX=Deco */

-          cmp  eax, dword ptr[edx + 8*4 + 4]// if (N<Dec->DecodeLen[8])

+          cmp  eax, dword ptr[edx + 8*4 + 4] /* if (N<Dec->DecodeLen[8]) */

           jae  else_G

-             cmp  eax, dword ptr[edx + 4*4 + 4]// if (N<Dec->DecodeLen[4])

+             cmp  eax, dword ptr[edx + 4*4 + 4] /* if (N<Dec->DecodeLen[4]) */

              jae  else_F

-                cmp  eax, dword ptr[edx + 2*4 + 4]// if (N<Dec->DecodeLen[2])

+                cmp  eax, dword ptr[edx + 2*4 + 4] /* if (N<Dec->DecodeLen[2]) */

                 jae  else_C

-                   cmp  eax, dword ptr[edx + 1*4 + 4]// if (N<Dec->DecodeLen[1])

+                   cmp  eax, dword ptr[edx + 1*4 + 4] /* if (N<Dec->DecodeLen[1]) */

                    jae  else_1

-                   mov  I, 1                         //  I=1;

+                   mov  I, 1                         /*  I=1; */

                    jmp  next_1

-                 else_1:                             // else

-                   mov  I, 2                         //  I=2;

+                 else_1:                             /* else */

+                   mov  I, 2                         /*  I=2; */

                  next_1:

                 jmp  next_C

-              else_C:                             // else

+              else_C:                             /* else */

-                   cmp  eax, dword ptr[edx + 3*4 + 4]// if (N<Dec->DecodeLen[3])

+                   cmp  eax, dword ptr[edx + 3*4 + 4] /* if (N<Dec->DecodeLen[3]) */

                    jae  else_2

-                   mov  I, 3                         //  I=3;

+                   mov  I, 3                         /*  I=3; */

                    jmp  next_2

-                 else_2:                             // else

-                   mov  I, 4                         //  I=4;

+                 else_2:                             /* else */

+                   mov  I, 4                         /*  I=4; */

                  next_2:

-              next_C:                             // else

+              next_C:                             /* else */

              jmp  next_F

            else_F:

-             cmp  eax, dword ptr[edx + 6*4 + 4]// if (N<Dec->DecodeLen[6])

+             cmp  eax, dword ptr[edx + 6*4 + 4] /* if (N<Dec->DecodeLen[6]) */

              jae  else_E

-                cmp  eax, dword ptr[edx + 5*4 + 4]// if (N<Dec->DecodeLen[5])

+                cmp  eax, dword ptr[edx + 5*4 + 4] /* if (N<Dec->DecodeLen[5]) */

                 jae  else_3

-                mov  I, 5                         //  I=5;

+                mov  I, 5                         /*  I=5; */

                 jmp  next_3

-              else_3:                             // else

-                mov  I, 6                         //  I=6;

+              else_3:                             /* else */

+                mov  I, 6                         /*  I=6; */

               next_3:

              jmp  next_E

-           else_E:                             // else

+           else_E:                             /* else */

-                cmp  eax, dword ptr[edx + 7*4 + 4]// if (N<Dec->DecodeLen[7])

+                cmp  eax, dword ptr[edx + 7*4 + 4] /* if (N<Dec->DecodeLen[7]) */

                 jae  else_4

-                mov  I, 7                         //  I=7;

+                mov  I, 7                         /*  I=7; */

                 jmp  next_4

-              else_4:                             // else

-                mov  I, 8                         //  I=8;

+              else_4:                             /* else */

+                mov  I, 8                         /*  I=8; */

               next_4:

            next_E:

@@ -1883,51 +1885,51 @@ static void DecodeNumber(struct Decode *Deco)

           jmp  next_G

         else_G:

-          cmp  eax, dword ptr[edx + 12*4 + 4] // if (N<Dec->DecodeLen[12])

+          cmp  eax, dword ptr[edx + 12*4 + 4] /* if (N<Dec->DecodeLen[12]) */

           jae  else_D

-             cmp  eax, dword ptr[edx + 10*4 + 4]// if (N<Dec->DecodeLen[10])

+             cmp  eax, dword ptr[edx + 10*4 + 4] /* if (N<Dec->DecodeLen[10]) */

              jae  else_B

-                cmp  eax, dword ptr[edx + 9*4 + 4]// if (N<Dec->DecodeLen[9])

+                cmp  eax, dword ptr[edx + 9*4 + 4] /* if (N<Dec->DecodeLen[9]) */

                 jae  else_5

-                mov  I, 9                         //  I=9;

+                mov  I, 9                         /*  I=9; */

                 jmp  next_5

-              else_5:                             // else

-                mov  I, 10                         //  I=10;

+              else_5:                             /* else */

+                mov  I, 10                         /*  I=10; */

               next_5:

              jmp  next_B

-           else_B:                             // else

+           else_B:                             /* else */

-                cmp  eax, dword ptr[edx + 11*4 + 4]// if (N<Dec->DecodeLen[11])

+                cmp  eax, dword ptr[edx + 11*4 + 4] /* if (N<Dec->DecodeLen[11]) */

                 jae  else_6

-                mov  I, 11                         //  I=11;

+                mov  I, 11                         /*  I=11; */

                 jmp  next_6

-              else_6:                             // else

-                mov  I, 12                         //  I=12;

+              else_6:                              /* else */

+                mov  I, 12                         /*  I=12; */

               next_6:

            next_B:

           jmp  next_D

-        else_D:                             // else

+        else_D:                             /* else */

-               cmp  eax, dword ptr[edx + 14*4 + 4]// if (N<Dec->DecodeLen[14])

+               cmp  eax, dword ptr[edx + 14*4 + 4] /* if (N<Dec->DecodeLen[14]) */

                jae  else_A

-                  cmp  eax, dword ptr[edx + 13*4 + 4]// if (N<Dec->DecodeLen[13])

+                  cmp  eax, dword ptr[edx + 13*4 + 4] /* if (N<Dec->DecodeLen[13]) */

                   jae  else_7

-                  mov  I, 13                         //  I=13;

+                  mov  I, 13                         /*  I=13; */

                   jmp  next_7

-                 else_7:                             // else

-                  mov  I, 14                         //  I=14;

+                 else_7:                             /* else */

+                  mov  I, 14                         /*  I=14; */

                  next_7:

                jmp  next_A

-              else_A:                             // else

-               mov  I, 15                         //  I=15;

+              else_A:                             /* else */

+               mov  I, 15                         /*  I=15; */

               next_A:

         next_D:

@@ -2546,19 +2548,19 @@ void SetCryptKeys(char *Password)

                     mov ebx, Offset SubstTable

                     mov edx, ebx

-                    xor ecx, ecx            // read SubstTable[N1]...

+                    xor ecx, ecx            /* read SubstTable[N1]... */

                     mov cl, N1

                     add ebx, ecx

                     mov al, byte ptr[ebx]

-                    mov cl, N1              // read SubstTable[(N1+I+K)&0xFF]...

+                    mov cl, N1              /* read SubstTable[(N1+I+K)&0xFF]... */

                     add ecx, I

                     add ecx, K

                     and ecx, 0xFF

                     add edx, ecx

                     mov ah, byte ptr[edx]

-                    mov  byte ptr[ebx], ah  // and write back

+                    mov  byte ptr[ebx], ah  /* and write back */

                     mov  byte ptr[edx], al

                }

@@ -223,7 +223,7 @@ vba_project_t *vba56_dir_read(const char *dir)

 	uint16_t ooff;

 	uint8_t byte_count;

 	uint32_t offset;

-	uint32_t LidA;  //Language identifiers

+	uint32_t LidA;  /* Language identifiers */

 	uint32_t LidB;

 	uint16_t CharSet;

 	uint16_t LenA;

@@ -16,7 +16,7 @@

 #include <zzip.h>                                   /* exported... */

 #include <zzip-file.h>

-#include <stddef.h> /*offsetof*/

+#include <stddef.h> /* offsetof */

 #include <stdlib.h>

 #include <string.h>

 #include <errno.h>

@@ -27,7 +27,9 @@

 #include <stdio.h>

 #endif

-//#include "__dirent.h"

+/*

+#include "__dirent.h"

+*/

 #ifndef offsetof

 #pragma warning had to DEFINE offsetof as it was not in stddef.h

@@ -28,7 +28,9 @@

 #include <ctype.h>

 #include <zzipformat.h>

-//#include "__debug.h"

+/*

+#include "__debug.h"

+*/

 #if 0

 # if defined ZZIP_HAVE_IO_H

@@ -175,8 +177,10 @@ zzip_file_open(ZZIP_DIR * dir, zzip_char_t* name, int o_mode)

             if (n)  hdr_name = n + 1;

         }

-        //HINT4("name='%s', compr=%d, size=%d\n", 

-	  //    hdr->d_name, hdr->d_compr, hdr->d_usize);

+        /*

+        HINT4("name='%s', compr=%d, size=%d\n", 

+	      hdr->d_name, hdr->d_compr, hdr->d_usize);

+	*/

         if (!cmp(hdr_name, name))

         {

@@ -28,8 +28,10 @@

 #include <sys/stat.h>

 #endif

-//#include "__mmap.h"

-//#include "__debug.h"

+/*

+#include "__mmap.h"

+#include "__debug.h"

+*/

 #define __sizeof(X) ((zzip_ssize_t)(sizeof(X)))

@@ -94,8 +96,10 @@ _zzip_inline static void __fixup_rootseek(

 	trailer->z_rootseek[1] = offset >> 8 & 0xff;

 	trailer->z_rootseek[2] = offset >> 16 & 0xff;

 	trailer->z_rootseek[3] = offset >> 24 & 0xff;

-	//HINT2("new rootseek=%li", 

-	 //     (long) ZZIP_GET32(trailer->z_rootseek));

+	/*

+	HINT2("new rootseek=%li", 

+	        (long) ZZIP_GET32(trailer->z_rootseek));

+	*/

     }

 }

 #define __correct_rootseek(A,B,C)

@@ -126,8 +130,11 @@ _zzip_inline static void __debug_dir_hdr (struct zzip_dir_hdr* hdr)

      *  (as long as the following assertion holds...) 

      */

-    //if (((unsigned)hdr)&3)

-    //{ NOTE1("this machine's malloc(3) returns sth. not u32-aligned"); }

+    /*

+    if (((unsigned)hdr)&3)

+    { NOTE1("this machine's malloc(3) returns sth. not u32-aligned"); }

+    */

+    

     /* we assume that if this machine's malloc has returned a non-aligned 

      * memory block, then it is actually safe to access misaligned data, and 

      * since it does only affect the first hdr it should not even bring about

@@ -167,7 +174,9 @@ __zzip_find_disk_trailer(int fd, zzip_off_t filesize,

 #else

 */

 #define return(val) { e=val; goto cleanup; }

-//#endif

+/*

+#endif

+*/

     register int e;

 #ifndef _LOWSTK

@@ -251,8 +260,10 @@ __zzip_find_disk_trailer(int fd, zzip_off_t filesize,

             if (io->read(fd, buf, (zzip_size_t)maplen) < (zzip_ssize_t)maplen)

                 { return(ZZIP_DIR_READ); }

             mapped = buf; /* success */

-	    //HINT5("offs=$%lx len=%li filesize=%li pagesize=%i", 

-		//(long)offset, (long)maplen, (long)filesize, ZZIP_BUFSIZ);

+	    /*

+	    HINT5("offs=$%lx len=%li filesize=%li pagesize=%i", 

+		(long)offset, (long)maplen, (long)filesize, ZZIP_BUFSIZ);

+	    */

         }

 	{/* now, check for the trailer-magic, hopefully near the end of file */

@@ -389,9 +400,9 @@ __zzip_parse_root_directory(int fd,

         u_comment = ZZIP_GET16(d->z_comment); 

         u_namlen  = ZZIP_GET16(d->z_namlen); 

 	u_flags   = ZZIP_GET16(d->z_flags);

-        //HINT5("offset=0x%lx, size %ld, dirent *%p, hdr %p\n",

-	  //    offset+u_rootseek, (long)u_rootsize, d, hdr);

-

+        /*HINT5("offset=0x%lx, size %ld, dirent *%p, hdr %p\n",

+	      offset+u_rootseek, (long)u_rootsize, d, hdr);

+	*/

         /* writes over the read buffer, Since the structure where data is

            copied is smaller than the data in buffer this can be done.

            It is important that the order of setting the fields is considered

@@ -424,12 +435,14 @@ __zzip_parse_root_directory(int fd,

         if (offset > (long)u_rootsize)

 	{ /*FAIL2("%i's end beyond root directory", entries);*/ entries--; break;}

-        //HINT5("file %d { compr=%d crc32=$%x offset=%d", 

-	  //    entries,  hdr->d_compr, hdr->d_crc32, hdr->d_off);

-        //HINT5("csize=%d usize=%d namlen=%d extras=%d", 

-	  //    hdr->d_csize, hdr->d_usize, u_namlen, u_extras);

-        //HINT5("comment=%d name='%s' %s <sizeof %d> } ", 

-	   //   u_comment, hdr->d_name, "",(int) sizeof(*d));

+        /*

+        HINT5("file %d { compr=%d crc32=$%x offset=%d", 

+	      entries,  hdr->d_compr, hdr->d_crc32, hdr->d_off);

+        HINT5("csize=%d usize=%d namlen=%d extras=%d", 

+	      hdr->d_csize, hdr->d_usize, u_namlen, u_extras);

+        HINT5("comment=%d name='%s' %s <sizeof %d> } ", 

+	      u_comment, hdr->d_name, "",(int) sizeof(*d));

+	*/

         p_reclen = &hdr->d_reclen;

@@ -603,18 +616,24 @@ __zzip_dir_parse (ZZIP_DIR* dir)

      *     { rv = EINVAL; goto error; } 

      */

-    //HINT2("------------------ fd=%i", (int) dir->fd);

+    /*

+    HINT2("------------------ fd=%i", (int) dir->fd);

+    */

     if ((filesize = dir->io->filesize(dir->fd)) < 0)

         { rv = ZZIP_DIR_STAT; goto error; }

-    //HINT2("------------------ filesize=%ld", (long) filesize);

+    /*

+    HINT2("------------------ filesize=%ld", (long) filesize);

+    */

     if ((rv = __zzip_find_disk_trailer(dir->fd, filesize, &trailer, 

                                        dir->io)) != 0)

         { goto error; }

-    //HINT5("directory = { entries= %d/%d, size= %d, seek= %d } ", 

-	//  ZZIP_GET16(trailer.z_entries),  ZZIP_GET16(trailer.z_finalentries),

-	//  ZZIP_GET32(trailer.z_rootsize), ZZIP_GET32(trailer.z_rootseek));

+    /*

+    HINT5("directory = { entries= %d/%d, size= %d, seek= %d } ", 

+	  ZZIP_GET16(trailer.z_entries),  ZZIP_GET16(trailer.z_finalentries),

+	  ZZIP_GET32(trailer.z_rootsize), ZZIP_GET32(trailer.z_rootseek));

+    */

     if ( (rv = __zzip_parse_root_directory(dir->fd, &trailer, &dir->hdr0, 

                                            dir->io)) != 0)