@@ -1,52 +1,60 @@

-Tomasz Kojm <zolw@konarski.edu.pl>

+Tomasz Kojm <tkojm*clamav.net>

 home page : http://www.konarski.edu.pl/~zolw

-gpg key   : http://www.konarski.edu.pl/~zolw/tkojm.gpg

+gpg key   : http://www.clamav.net/gpg/tkojm.gpg

 GPG = 0DCA 5A08 407D 5288 279D  B434 5482 2DC8 985A 444B

-Nigel Horne <njh@bandsman.co.uk>

+Nigel Horne <njh*clamav.net>

 home page : http://bandsman.co.uk

 Author of clamav-milter and the whole mbox code.

 System administrator (www, mailing lists, mirror issues, virus

-submission mechanisms): Luca 'NERvOus' Gibelli <nervous@nervous.it>

+submission mechanisms): Luca 'NERvOus' Gibelli <nervous*clamav.net>

+

+Submission management interface (for database developers only): Thomas Madsen

+<tm*softcom.dk>

+

 Database developers:

-aCaB <acab@digitalfuture.it>

-Diego D'Ambra <da@softcom.dk>

-Jason Englander <jason@englanders.cc>

-Tomasz Kojm <zolw@konarski.edu.pl>

-Tomasz Papszun <tomek@lodz.tpsa.pl>

+aCaB <acab*clamav.net>

+Diego D'Ambra <diego*clamav.net>

+Jason Englander <jason*clamav.net>

+Tomasz Kojm <tkojm*clamav.net>

+Tomasz Papszun <tomek*clamav.net>

+ClamAV logo: Mia Kalenius and Sergei Pronin <sp*finndesign.fi>

+TrashScan was written by Trashware <trashware*gmx.net>.

-TrashScan was written by Trashware <trashware@gmx.net>.

+libclamav/zziplib: Guido Draheim <guidod*gmx.de>

+libclamav/unrarlib.c: Christian Scheurer and Johannes Winkelmann (jw*tks6.net)

 ClamAV patches were submitted by (in alphabetical order):

-Kamil Andrusz <wizz@mniam.net>

-Patrick Bihan-Faou <patrick@mindstep.com>

-Damien Curtain <damien@pagefault.org>

-Michael Dankov <misha@btrc.ru>

-Alejandro Dubrovsky <s328940@student.uq.edu.au>

-Magnus Ekdahl <magnus@debian.org>

-Jason Englander <jason@englanders.cc>

-David Ford <david+cert@blue-labs.org>

-Nigel Horne <njh@smsltd.demon.co.uk>

-Hrvoje Habjanic <hrvoje.habjanic@zg.hinet.hr>

-Nicholas M. Kirsch <nick@kirsch.org>

-Robbert Kouprie <robbert@exx.nl>

-Thomas Lamy <Thomas.Lamy@in-online.net>

-Peter N Lewis <peter@stairways.com.au>

-Mark Mielke <mark@mark.mielke.cc>

-Arkadiusz Miskiewicz <misiek@pld.org.pl>

-Hendrik Muhs <Hendrik.Muhs@student.uni-magdeburg.de>

-Masaki Ogawa <proc@mac.com>

-Ed Phillips <ed@UDel.Edu>

-Andreas Piesk <Andreas.Piesk@heise.de>

-Ant La Porte <ant@dvere.net>

-Thomas Quinot <thomas@cuivre.fr.eu.org>

-Joe Talbott <josepht@cstone.net>

-Gernot Tenchio <g.tenchio@telco-tech.de>

-Laurent Wacrenier <lwa@teaser.fr>

-David Woakes <david@mitredata.co.uk>

-Andoni Zubimendi <andoni@lpsat.net>

+Kamil Andrusz <wizz*mniam.net>

+Patrick Bihan-Faou <patrick*mindstep.com>

+Damien Curtain <damien*pagefault.org>

+Michael Dankov <misha*btrc.ru>

+Alejandro Dubrovsky <s328940*student.uq.edu.au>

+Magnus Ekdahl <magnus*debian.org>

+Jason Englander <jason*englanders.cc>

+David Ford <david+cert*blue-labs.org>

+Nigel Horne <njh*smsltd.demon.co.uk>

+Hrvoje Habjanic <hrvoje.habjanic*zg.hinet.hr>

+Nicholas M. Kirsch <nick*kirsch.org>

+Robbert Kouprie <robbert*exx.nl>

+Thomas Lamy <Thomas.Lamy*in-online.net>

+Peter N Lewis <peter*stairways.com.au>

+Mark Mielke <mark*mark.mielke.cc>

+Arkadiusz Miskiewicz <misiek*pld.org.pl>

+Hendrik Muhs <Hendrik.Muhs*student.uni-magdeburg.de>

+Masaki Ogawa <proc*mac.com>

+Ed Phillips <ed*UDel.Edu>

+Andreas Piesk <Andreas.Piesk*heise.de>

+Ant La Porte <ant*dvere.net>

+Thomas Quinot <thomas*cuivre.fr.eu.org>

+Matt Sullivan <matt*sullivan.gen.nz>

+Joe Talbott <josepht*cstone.net>

+Gernot Tenchio <g.tenchio*telco-tech.de>

+Laurent Wacrenier <lwa*teaser.fr>

+David Woakes <david*mitredata.co.uk>

+Andoni Zubimendi <andoni*lpsat.net>

@@ -1,5 +1,16 @@

+Sun Nov  9 03:21:48 CET 2003 (tk)

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

+  * libclamav: archive wrapper and database parsing functions were using a

+	       huge buffers of size BUFFSIZE instead of FBUFFSIZE. These

+	       defines have been renamed to SCANBUFF and FILEBUFF respectively.

+	       The bug was responsible (e.g.) for clamd lockups (due to a stack

+	       size overflow) with CVD under FreeBSD (reported by Tim Wilde

+	       twilde*dyndns.org). The fix also makes all that buffers

+	       dynamically allocable (this is a part of Rudolph Pereira's

+	       patch that will be included soon).

+

 Thu Nov  6 22:40:58 CET 2003 (tk)

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

   * libclamav: zziplib: reverted to 0.12.83

 Thu Nov  6 10:36:57 IST 2003 (njh)

@@ -1,5 +1,5 @@

 Note: This README/NEWS file refers to the source tarball. Some things described

-here may not be available in the binary packages.

+here may not be available in a binary packages.

 --

@@ -8,7 +8,7 @@ here may not be available in the binary packages.

 ----

 -) clamd:

-    + fixed a race condition in the database reloading code (random hangs

+    + fixed a race condition in database reloading code (random hangs

       under high load)

     + fixed PidFile permissions (Magnus Ekdahl, bug reported by Tomasz Papszun)

     + fixed LogFile permissions (Magnus Ekdahl)

@@ -19,17 +19,15 @@ here may not be available in the binary packages.

     + new directive Debug

 -) clamav-milter:

-    + 

     + new --force-scan flag

     + new -P and -q flags by Nicholas M. Kirsch

 -) libclamav:

     + multiple mbox fixes (thanks to Rene Bellora, Bernd Kuhls, Thomas Lamy, 

-      Tomasz Papszun,

-

+      Tomasz Papszun)

     + memory leak fixes (Thomas Lamy)

-    + support for a new database container format (CVD) with support for

-      digital signatures, 

+    + support for a new database container format (CVD) - compressed and

+      digitally signed

     + new scan option CL_DISABLERAR (disables built-in RAR unpacker)

 -) freshclam:

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.11 2003/11/06 02:03:35 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.12 2003/11/09 02:29:23 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.11 2003/11/06 02:03:35 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.12 2003/11/09 02:29:23 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -100,7 +100,7 @@ int dirscan(const char *dirname, char **virname, unsigned long int *scanned, con

 					ret = 2;

 				} else if(scanret != CL_CLEAN) {

 				    mdprintf(odesc, "%s: %s ERROR\n", fname, cl_strerror(scanret));

-				    logg("*%s: %s\n ERROR", fname, cl_strerror(scanret));

+				    logg("%s: %s\n ERROR", fname, cl_strerror(scanret));

 				}

 		    }

@@ -155,8 +155,8 @@ void clamscan(struct optstruct *opt)

 	mprintf("Data scanned: %2.2lf MB\n", mb);

 	    logg("Data scanned: %2.2lf MB\n", mb);

-	mprintf("I/O buffer size: %d bytes\n", BUFFSIZE);

-	    logg("I/O buffer size: %d bytes\n", BUFFSIZE);

+	mprintf("I/O buffer size: %d bytes\n", SCANBUFF);

+	    logg("I/O buffer size: %d bytes\n", SCANBUFF);

 	mprintf("Time: %d.%3.3d sec (%d m %d s)\n", ds, dms/1000, ds/60, ds%60);

 	    logg("Time: %d.%3.3d sec (%d m %d s)\n", ds, dms/1000, ds/60, ds%60);

     }

@@ -7692,11 +7692,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'

 cat >>confdefs.h <<\_ACEOF

-#define BUFFSIZE 131072

+#define SCANBUFF 131072

 _ACEOF

 cat >>confdefs.h <<\_ACEOF

-#define FBUFFSIZE 16384

+#define FILEBUFF 8192

 _ACEOF

@@ -48,8 +48,8 @@ dnl AC_SUBST(LT_AGE)

 dnl BUFFSIZE must be at least 16 kb !!!

-AC_DEFINE(BUFFSIZE, 131072)

-AC_DEFINE(FBUFFSIZE, 16384)

+AC_DEFINE(SCANBUFF, 131072)

+AC_DEFINE(FILEBUFF, 8192)

 AC_HEADER_STDC

 AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h)

@@ -316,7 +316,7 @@ int wwwconnect(const char *server, const char *proxy, char *ip)

 /* TODO: use a HEAD instruction to see if the file has been changed */

 struct cl_cvd *remote_cvdhead(const char *file, int socketfd, const char *hostname, const char *proxy, const char *user)

 {

-	char cmd[512], head[513], buffer[FBUFFSIZE], *ch, *tmp;

+	char cmd[512], head[513], buffer[FILEBUFF], *ch, *tmp;

 	int i, j, bread, cnt;

 	char *remotename = NULL, *authorization = NULL;

 	struct cl_cvd *cvd;

@@ -359,7 +359,7 @@ struct cl_cvd *remote_cvdhead(const char *file, int socketfd, const char *hostna

     free(authorization);

     tmp = buffer;

-    cnt = FBUFFSIZE;

+    cnt = FILEBUFF;

     while ((bread = recv(socketfd, tmp, cnt, 0)) > 0) {

 	tmp+=bread;

 	cnt-=bread;

@@ -411,7 +411,7 @@ struct cl_cvd *remote_cvdhead(const char *file, int socketfd, const char *hostna

 int

 get_database(const char *dbfile, int socketfd, const char *file, const char *hostname, const char *proxy, const char *user)

 {

-	char cmd[512], buffer[FBUFFSIZE];

+	char cmd[512], buffer[FILEBUFF];

 	char *ch;

 	int bread, fd, i, rot = 0;

 	char *remotename = NULL, *authorization = NULL;

@@ -459,7 +459,7 @@ get_database(const char *dbfile, int socketfd, const char *file, const char *hos

     free(remotename);

     free(authorization);

-    if ((bread = recv(socketfd, buffer, FBUFFSIZE, 0)) == -1) {

+    if ((bread = recv(socketfd, buffer, FILEBUFF, 0)) == -1) {

       mprintf("@Error while reading database from %s\n", hostname);

       return -1;

     }

@@ -482,7 +482,7 @@ get_database(const char *dbfile, int socketfd, const char *file, const char *hos

     }  

     write(fd, ch, bread - i);

-    while((bread = read(socketfd, buffer, FBUFFSIZE))) {

+    while((bread = read(socketfd, buffer, FILEBUFF))) {

 	write(fd, buffer, bread);

 	mprintf("Downloading %s [%c]\r", dbfile, rotation[rot]);

 	fflush(stdout);

@@ -263,7 +263,7 @@ int cl_cvdverify(const char *file)

 int cli_cvdload(FILE *fd, struct cl_node **root, int *virnum)

 {

-        char *dir, *tmp, buffer[BUFFSIZE];

+        char *dir, *tmp, *buffer;

 	int bytes, ret;

 	const char *tmpdir;

 	FILE *tmpd;

@@ -310,11 +310,17 @@ int cli_cvdload(FILE *fd, struct cl_node **root, int *virnum)

 		cli_errmsg("Can't create temporary file %s\n", tmp);

 		free(dir);

 		free(tmp);

-		return -1;

+		return CL_ETMPFILE;

 	    }

-	    while((bytes = fread(buffer, 1, BUFFSIZE, fd)) > 0)

+

+	    if(!(buffer = (char *) cli_malloc(FILEBUFF)))

+		return CL_EMEM;

+

+	    while((bytes = fread(buffer, 1, FILEBUFF, fd)) > 0)

 		fwrite(buffer, 1, bytes, tmpd);

+	    free(buffer);

+

 	    fflush(tmpd);

 	    fseek(tmpd, 0L, SEEK_SET);

@@ -79,7 +79,7 @@ int cli_parse_add(struct cl_node *root, const char *virname, const char *hexstr,

 int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 {

 	FILE *fd;

-	char buffer[BUFFSIZE], *pt, *start, *pt2;

+	char *buffer, *pt, *start, *pt2;

 	int line = 0, ret, parts, i, sigid = 0;

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

     cli_dbgmsg("Loading %s\n", filename);

+    if(!(buffer = (char *) cli_malloc(FILEBUFF)))

+	return CL_EMEM;

+

     /* check for CVD file */

     fgets(buffer, 12, fd);

     rewind(fd);

@@ -98,10 +101,11 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 	cli_dbgmsg("%s: CVD file detected\n", filename);

 	ret = cli_cvdload(fd, root, virnum);

 	fclose(fd);

+	free(buffer);

 	return ret;

     }

-    while(fgets(buffer, BUFFSIZE, fd)) {

+    while(fgets(buffer, FILEBUFF, fd)) {

 	/* for forward compatibility */

 	if(strchr(buffer, '{') || strchr(buffer, '}')) {

@@ -115,6 +119,7 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 	pt = strchr(buffer, '=');

 	if(!pt) {

 	    cli_errmsg("readdb(): Malformed pattern line %d (file %s).\n", line, filename);

+	    free(buffer);

 	    return CL_EMALFDB;

 	}

@@ -126,8 +131,10 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 	if(!*root) {

 	    cli_dbgmsg("Initializing trie.\n");

 	    *root = (struct cl_node *) cli_calloc(1, sizeof(struct cl_node));

-	    if(!*root)

+	    if(!*root) {

+		free(buffer);

 		return CL_EMEM;

+	    }

 	    (*root)->maxpatlen = 0;

 	}

@@ -146,6 +153,7 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 		if((ret = cli_parse_add(*root, start, pt2, sigid, parts, i))) {

 		    cli_dbgmsg("parse_add() return code: %d\n", ret);

 		    cli_errmsg("readdb(): Malformed pattern line %d (file %s).\n", line, filename);

+		    free(buffer);

 		    return ret;

 		}

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

@@ -156,11 +164,13 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 	    if((ret = cli_parse_add(*root, start, pt, 0, 0, 0))) {

 		cli_dbgmsg("parse_add() return code: %d\n", ret);

 		cli_errmsg("readdb(): Malformed pattern line %d (file %s).\n", line, filename);

+		free(buffer);

 		return ret;

 	    }

 	}

     }

+    free(buffer);

     fclose(fd);

     if(virnum != NULL)

 	*virnum += line;

@@ -72,33 +72,33 @@ cl_node *root)

     /* prepare the buffer */

-    buffsize = root->maxpatlen + BUFFSIZE;

+    buffsize = root->maxpatlen + SCANBUFF;

     if(!(buffer = (char *) cli_calloc(buffsize, sizeof(char))))

 	return CL_EMEM;

     buff = buffer;

     buff += root->maxpatlen; /* pointer to read data block */

-    endbl = buff + BUFFSIZE - root->maxpatlen; /* pointer to the last block

+    endbl = buff + SCANBUFF - root->maxpatlen; /* pointer to the last block

 						* length of root->maxpatlen

 						*/

     pt= buff;

-    length = BUFFSIZE;

+    length = SCANBUFF;

-    while((bytes = read(desc, buff, BUFFSIZE)) > 0) {

+    while((bytes = read(desc, buff, SCANBUFF)) > 0) {

 	if(scanned != NULL)

 	    *scanned += bytes / CL_COUNT_PRECISION;

-	if(bytes < BUFFSIZE)

-	    length -= BUFFSIZE - bytes;

+	if(bytes < SCANBUFF)

+	    length -= SCANBUFF - bytes;

 	if(cl_scanbuff(pt, length, virname, root) == CL_VIRUS) {

 	    free(buffer);

 	    return CL_VIRUS;

 	}

-	if(bytes == BUFFSIZE)

+	if(bytes == SCANBUFF)

 	    memmove(buffer, endbl, root->maxpatlen);

         pt = buffer;

@@ -241,7 +241,7 @@ int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_nod

 	ZZIP_DIRENT zdirent;

 	ZZIP_FILE *zfp;

 	FILE *tmp;

-	char buff[BUFFSIZE];

+	char *buff;

 	int fd, bytes, files = 0, ret = CL_CLEAN, err;

@@ -297,17 +297,22 @@ int cli_scanzip(int desc, char **virname, long int *scanned, const struct cl_nod

 	    continue;

 	}

-	while((bytes = zzip_file_read(zfp, buff, BUFFSIZE)) > 0) {

+	if(!(buff = (char *) cli_malloc(FILEBUFF)))

+	    return CL_EMEM;

+

+	while((bytes = zzip_file_read(zfp, buff, FILEBUFF)) > 0) {

 	    if(fwrite(buff, bytes, 1, tmp)*bytes != bytes) {

 		cli_dbgmsg("Zip -> Can't fwrite() file: %s\n", strerror(errno));

 		zzip_file_close(zfp);

 		zzip_dir_close(zdir);

 		files++;

 		fclose(tmp);

+		free(buff);

 		return CL_EZIP;

 	    }

 	}

+	free(buff);

 	zzip_file_close(zfp);

 	if(fflush(tmp) != 0) {

@@ -358,7 +363,7 @@ int cli_scangzip(int desc, char **virname, long int *scanned, const struct cl_no

 {

 	int fd, bytes, ret = CL_CLEAN;

 	long int size = 0;

-	char buff[BUFFSIZE];

+	char *buff;

 	FILE *tmp;

 	gzFile gd;

@@ -375,11 +380,14 @@ int cli_scangzip(int desc, char **virname, long int *scanned, const struct cl_no

     }

     fd = fileno(tmp);

-    while((bytes = gzread(gd, buff, BUFFSIZE)) > 0) {

+    if(!(buff = (char *) cli_malloc(FILEBUFF)))

+	return CL_EMEM;

+

+    while((bytes = gzread(gd, buff, SCANBUFF)) > 0) {

 	size += bytes;

 	if(limits)

-	    if(limits->maxfilesize && (size + BUFFSIZE > limits->maxfilesize)) {

+	    if(limits->maxfilesize && (size + SCANBUFF > limits->maxfilesize)) {

 		cli_dbgmsg("Gzip->desc(%d): Size exceeded (stopped at %d, max: %d)\n", desc, size, limits->maxfilesize);

 		ret = CL_EMAXSIZE;

 		break;

@@ -389,10 +397,12 @@ int cli_scangzip(int desc, char **virname, long int *scanned, const struct cl_no

 	    cli_dbgmsg("Gzip -> Can't write() file.\n");

 	    fclose(tmp);

 	    gzclose(gd);

+	    free(buff);

 	    return CL_EGZIP;

 	}

     }

+    free(buff);

     gzclose(gd);

     if(fsync(fd) == -1) {

 	cli_dbgmsg("fsync() failed for descriptor %d\n", fd);

@@ -425,7 +435,7 @@ int cli_scanbzip(int desc, char **virname, long int *scanned, const struct cl_no

 	int fd, bytes, ret = CL_CLEAN, bzerror = 0;

 	short memlim = 0;

 	long int size = 0;

-	char buff[BUFFSIZE];

+	char *buff;

 	FILE *fs, *tmp;

 	BZFILE *bfd;

@@ -451,11 +461,14 @@ int cli_scanbzip(int desc, char **virname, long int *scanned, const struct cl_no

     }

     fd = fileno(tmp);

-    while((bytes = BZ2_bzRead(&bzerror, bfd, buff, BUFFSIZE)) > 0) {

+    if(!(buff = (char *) cli_malloc(FILEBUFF)))

+	return CL_EMEM;

+

+    while((bytes = BZ2_bzRead(&bzerror, bfd, buff, SCANBUFF)) > 0) {

 	size += bytes;

 	if(limits)

-	    if(limits->maxfilesize && (size + BUFFSIZE > limits->maxfilesize)) {

+	    if(limits->maxfilesize && (size + SCANBUFF > limits->maxfilesize)) {

 		cli_dbgmsg("Bzip2->desc(%d): Size exceeded (stopped at %d, max: %d)\n", desc, size, limits->maxfilesize);

 		ret = CL_EMAXSIZE;

 		break;

@@ -465,10 +478,12 @@ int cli_scanbzip(int desc, char **virname, long int *scanned, const struct cl_no

 	    cli_dbgmsg("Bzip2 -> Can't write() file.\n");

 	    BZ2_bzReadClose(&bzerror, bfd);

 	    fclose(tmp);

+	    free(buff);

 	    return CL_EGZIP;

 	}

     }

+    free(buff);

     BZ2_bzReadClose(&bzerror, bfd);

     if(fsync(fd) == -1) {

 	cli_dbgmsg("fsync() failed for descriptor %d\n", fd);

@@ -75,7 +75,7 @@ int scanfile(const char *cmd, const char *str, const char *file)

 char *cut(const char *file, long int start, long int end)

 {

-	char *fname = NULL, buffer[FBUFFSIZE];

+	char *fname = NULL, buffer[FILEBUFF];

 	int bytes, size, sum;

 	FILE *rd, *wd;

@@ -100,7 +100,7 @@ char *cut(const char *file, long int start, long int end)

     size = end - start;

     sum = 0;

-    while((bytes = fread(buffer, 1, FBUFFSIZE, rd)) > 0) {

+    while((bytes = fread(buffer, 1, FILEBUFF, rd)) > 0) {

 	if(sum + bytes >= size) {

 	    fwrite(buffer, 1, size - sum, wd);

 	    break;

@@ -118,7 +118,7 @@ char *cut(const char *file, long int start, long int end)

 char *change(const char *file, long int x)

 {

-	char *fname = NULL, buffer[FBUFFSIZE];

+	char *fname = NULL, buffer[FILEBUFF];

 	int bytes, size, sum, ch;

 	FILE *rd, *wd;

@@ -138,7 +138,7 @@ char *change(const char *file, long int x)

 	exit(14);

     }

-    while((bytes = fread(buffer, 1, FBUFFSIZE, rd)) > 0)

+    while((bytes = fread(buffer, 1, FILEBUFF, rd)) > 0)

 	fwrite(buffer, 1, bytes, wd);

     fclose(rd);

@@ -157,7 +157,7 @@ char *change(const char *file, long int x)

 void sigtool(struct optstruct *opt)

 {

-	    char buffer[FBUFFSIZE];

+	    char buffer[FILEBUFF];

 	    int bytes;

 	    char *pt;

@@ -183,7 +183,7 @@ void sigtool(struct optstruct *opt)

     if(optl(opt, "hex-dump")) {

-	while((bytes = read(0, buffer, FBUFFSIZE)) > 0) {

+	while((bytes = read(0, buffer, FILEBUFF)) > 0) {

 	    pt = cl_str2hex(buffer, bytes);

 	    write(1, pt, 2 * bytes);

 	    free(pt);

@@ -420,7 +420,7 @@ void sigtool(struct optstruct *opt)

 	mprintf("Saving signature in %s file.\n", signame);

-	while((bytes = fread(buffer, 1, FBUFFSIZE, fd)) > 0) {

+	while((bytes = fread(buffer, 1, FILEBUFF, fd)) > 0) {

 	    pt = cl_str2hex(buffer, bytes);

 	    fwrite(pt, 1, 2 * bytes, wd);

 	    free(pt);

@@ -459,7 +459,7 @@ int build(struct optstruct *opt)

 {

 	int ret, no = 0, realno = 0, bytes, itmp;

 	struct stat foo;

-	char buffer[BUFFSIZE], *tarfile = NULL, *gzfile = NULL, header[257],

+	char buffer[FILEBUFF], *tarfile = NULL, *gzfile = NULL, header[257],

 	     smbuff[25], *pt;

         struct cl_node *root = NULL;

 	FILE *tar, *cvd, *fd;

@@ -542,7 +542,7 @@ int build(struct optstruct *opt)

 	exit(1);

     }

-    while((bytes = fread(buffer, 1, BUFFSIZE, tar)) > 0)

+    while((bytes = fread(buffer, 1, FILEBUFF, tar)) > 0)

 	gzwrite(gz, buffer, bytes);

     fclose(tar);

@@ -647,7 +647,7 @@ int build(struct optstruct *opt)

 	exit(1);

     }

-    while((bytes = fread(buffer, 1, BUFFSIZE, tar)) > 0)

+    while((bytes = fread(buffer, 1, FILEBUFF, tar)) > 0)

 	fwrite(buffer, 1, bytes, cvd);

     fclose(tar);