@@ -1,3 +1,7 @@

+Wed Mar 10 01:35:40 CET 2004 (tk)

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

+  * libclamav: unrarlib: cleanup (Dirk Mueller <dmuell*gmx.net>)

+

 Tue Mar  9 23:49:06 CET 2004 (tk)

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

   * libclamav, sigtool: small code cleanups (Dirk Mueller <mueller*kde.org>)

@@ -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.26 2004/03/05 13:26:22 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.27 2004/03/10 00:37:55 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.26 2004/03/05 13:26:22 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.27 2004/03/10 00:37:55 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -123,6 +123,9 @@

 /* Define to 1 if you have the <stdlib.h> header file. */

 #undef HAVE_STDLIB_H

+/* Define to 1 if you have the `strerror_r' function. */

+#undef HAVE_STRERROR_R

+

 /* Define to 1 if you have the <strings.h> header file. */

 #undef HAVE_STRINGS_H

deleted file mode 100644

@@ -1,367 +0,0 @@

-/*

- *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation; either version 2 of the License, or

- *  (at your option) any later version.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  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., 675 Mass Ave, Cambridge, MA 02139, USA.

- */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <unistd.h>

-#include <sys/types.h>

-#include <sys/socket.h>

-#include <sys/wait.h>

-#include <pthread.h>

-#include <time.h>

-#include <signal.h>

-

-#include "cfgfile.h"

-#include "others.h"

-#include "defaults.h"

-#include "scanner.h"

-#include "server.h"

-#include "clamuko.h"

-#include "tests.h"

-

-int sighup = 0;

-

-#define CMD1 "SCAN"

-#define CMD2 "RAWSCAN"

-#define CMD3 "QUIT"

-#define CMD4 "RELOAD"

-#define CMD5 "PING"

-#define CMD6 "CONTSCAN"

-#define CMD7 "VERSION"

-#define CMD8 "STREAM"

-

-int procscan(const char *name, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt, int odesc, short contscan)

-{

-	int pid;

-	struct cfgstruct *cpt;

-

-    switch(pid = fork()) {

-	case -1:

-	    logg("!Can't fork()\n");

-	    return -1;

-

-	case 0:

-	    if((cpt = cfgopt(copt, "ThreadTimeout")))

-	        alarm(cpt->numarg);

-/* 0 should disable the limit

-	    else

-	        alarm(CL_DEFAULT_SCANTIMEOUT);

-*/

-

-	    if(!name)

-		scanstream(odesc, NULL, root, limits, options, copt);

-	    else

-		scan(name, NULL, root, limits, options, copt, odesc, contscan);

-

-	    exit(0);

-

-	default:

-	    return pid;

-    }

-

-    return -1;

-}

-

-int acceptd = -1;

-

-int acceptloop_proc(int socketd, struct cl_node *root, const struct cfgstruct *copt)

-{

-	int i, j, bread, options = 0, childs, *session, status,

-	    virnum, need_wait, ret;

-	struct cfgstruct *cpt;

-	struct cl_limits limits;

-	struct sigaction sigact;

-	char buff[1025];

-	const char *dbdir;

-	sigset_t sigset;

-	mode_t old_umask;

-

-    /* save the PID */

-    if((cpt = cfgopt(copt, "PidFile"))) {

-	    FILE *fd;

-	    old_umask = umask(0006);

-	if((fd = fopen(cpt->strarg, "w")) == NULL) {

-	    logg("!Can't save PID in file %s\n", cpt->strarg);

-	} else {

-	    fprintf(fd, "%d", getpid());

-	    fclose(fd);

-	}

-	umask(old_umask);

-    }

-

-    logg("*Listening daemon: PID: %d\n", getpid());

-

-    if((cpt = cfgopt(copt, "MaxThreads")))

-	childs = cpt->numarg;

-    else

-	childs = CL_DEFAULT_MAXTHREADS;

-

-    logg("Maximal number of childs: %d\n", childs);

-    session = (int *) mcalloc(childs, sizeof(int));

-

-    if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory")))

-	dbdir = cpt->strarg;

-    else

-        dbdir = cl_retdbdir();

-

-    if(cfgopt(copt, "ScanArchive")) {

-

-	/* set up limits */

-	memset(&limits, 0, sizeof(struct cl_limits));

-

-	if((cpt = cfgopt(copt, "ArchiveMaxFileSize"))) {

-	    if((limits.maxfilesize = cpt->numarg))

-		logg("Archive: Archived file size limit set to %d bytes.\n", limits.maxfilesize);

-	    else

-		logg("^Archive: File size limit protection disabled.\n");

-	} else {

-	    limits.maxfilesize = 10485760;

-	    logg("^USING HARDCODED LIMIT: Archive: Archived file size limit set to %d bytes.\n", limits.maxfilesize);

-	}

-

-	if((cpt = cfgopt(copt, "ArchiveMaxRecursion"))) {

-	    if((limits.maxreclevel = cpt->numarg))

-		logg("Archive: Recursion level limit set to %d.\n", limits.maxreclevel);

-	    else

-		logg("^Archive: Recursion level limit protection disabled.\n");

-	} else {

-	    limits.maxreclevel = 5;

-	    logg("^USING HARDCODED LIMIT: Archive: Recursion level set to %d.\n", limits.maxreclevel);

-	}

-

-	if((cpt = cfgopt(copt, "ArchiveMaxFiles"))) {

-	    if((limits.maxfiles = cpt->numarg))

-		logg("Archive: Files limit set to %d.\n", limits.maxfiles);

-	    else

-		logg("^Archive: Files limit protection disabled.\n");

-	} else {

-	    limits.maxfiles = 1000;

-	    logg("^USING HARDCODED LIMIT: Archive: Files limit set to %d.\n", limits.maxfiles);

-	}

-

-	if((cpt = cfgopt(copt, "ArchiveMaxCompressionRatio"))) {

-	    if((limits.maxratio = cpt->numarg))

-		logg("Archive: Compression ratio limit set to %d.\n", limits.maxratio);

-	    else

-		logg("^Archive: Compression ratio limit disabled.\n");

-	} else {

-	    limits.maxratio = 200;

-	    logg("^USING HARDCODED LIMIT: Archive: Compression ratio limit set to %d.\n", limits.maxratio);

-	}

-

-	if(cfgopt(copt, "ArchiveLimitMemoryUsage")) {

-	    limits.archivememlim = 1;

-	    logg("Archive: Limited memory usage.\n");

-	} else

-	    limits.archivememlim = 0;

-

-	

-	logg("Archive support enabled.\n");

-	options |= CL_ARCHIVE;

-

-	if(cfgopt(copt, "ScanRAR")) {

-	    logg("RAR support enabled.\n");

-	} else {

-	    logg("RAR support disabled.\n");

-	    options |= CL_DISABLERAR;

-	}

-

-    } else {

-	logg("Archive support disabled.\n");

-    }

-

-    if(cfgopt(copt, "ScanMail")) { 

-	logg("Mail support enabled.\n");

-	options |= CL_MAIL;

-    } else {

-	logg("Mail support disabled.\n");

-    }

-

-    if(cfgopt(copt, "ScanOLE2")) { 

-	logg("OLE2 support enabled.\n");

-	options |= CL_OLE2;

-    } else {

-	logg("OLE2 support disabled.\n");

-    }

-

-    /* set up signal handling */

-

-    sigfillset(&sigset);

-    sigdelset(&sigset, SIGINT);

-    sigdelset(&sigset, SIGTERM);

-    sigdelset(&sigset, SIGSEGV);

-    sigdelset(&sigset, SIGHUP);

-    sigprocmask(SIG_SETMASK, &sigset, NULL);

-

-    /* SIGINT, SIGTERM, SIGSEGV */

-    sigact.sa_handler = sighandler;

-    sigemptyset(&sigact.sa_mask);

-    sigaddset(&sigact.sa_mask, SIGINT);

-    sigaddset(&sigact.sa_mask, SIGTERM);

-    sigaddset(&sigact.sa_mask, SIGHUP);

-    sigaction(SIGINT, &sigact, NULL);

-    sigaction(SIGTERM, &sigact, NULL);

-#ifndef CL_DEBUG

-    sigaction(SIGSEGV, &sigact, NULL);

-#endif

-    sigaction(SIGHUP, &sigact, NULL);

-

-

-    while(1) {

-

-	for(i = 0; ; i++) { /* find a free session */

-

-	    /* free all finished childs */

-	    for(j = 0; j <= childs; j++)

-		if(session[j] && waitpid(session[j], &status, WNOHANG))

-		    session[j] = 0;

-

-	    if(i == childs) {

-		i = 0;

-		usleep(50000);

-	    }

-

-	    if(!session[i])

-		break;

-	}

-

-	if((acceptd = accept(socketd, NULL, NULL)) == -1) {

-	    logg("!accept() failed.\n");

-	    /* exit ? */

-	    continue;

-	}

-

-	if((bread = read(acceptd, buff, 1024)) == -1) {

-	    logg("!read(desc %d) failed.\n", acceptd);

-	} else {

-

-	    buff[bread] = 0;

-	    chomp(buff);

-

-	    if(!strncmp(buff, CMD1, strlen(CMD1))) { /* SCAN */

-		session[i] = procscan(buff + strlen(CMD1) + 1, root, &limits, options, copt, acceptd, 0);

-

-	    } else if(!strncmp(buff, CMD2, strlen(CMD2))) { /* RAWSCAN */

-		options &= ~CL_ARCHIVE;

-		session[i] = procscan(buff + strlen(CMD2) + 1, root, NULL, options, copt, acceptd, 0);

-

-	    } else if(!strncmp(buff, CMD3, strlen(CMD3))) { /* QUIT */

-		kill(0, SIGTERM);

-

-	    } else if(!strncmp(buff, CMD4, strlen(CMD4))) { /* RELOAD */

-		mdprintf(acceptd, "RELOADING\n");

-

-		/* wait until all childs are finished */

-		do {

-		    need_wait = 0;

-

-		    /* free all finished childs */

-		    for(i = 0; i <= childs; i++)

-			if(session[i] && waitpid(session[i], &status, WNOHANG))

-			    session[i] = 0;

-

-		    for(i = 0; i <= childs; i++)

-			if(session[i])

-			    need_wait = 1;

-

-		    if(need_wait)

-			usleep(200000);

-

-		} while(need_wait);

-

-		cl_freetrie(root);

-		root = NULL;

-		logg("Reading databases from %s\n", dbdir);

-		//cl_statfree(&dbstat);

-		//cl_statinidir(dbdir, &dbstat);

-		virnum = 0;

-		if((ret = cl_loaddbdir(dbdir, &root, &virnum))) {

-		    logg("!%s\n", cl_strerror(ret));

-		    exit(1);

-		}

-

-		if(!root) {

-		    logg("!Database initialization problem.\n");

-		    exit(1);

-		} else {

-		    if((ret = cl_buildtrie(root)) != 0) {

-			logg("!Database initialization error: can't build the trie: %s\n", cl_strerror(i));

-			exit(1);

-		    }

-		    /* check integrity */

-		    if(!testsignature(root)) {

-			logg("!Unable to detect test signature.\n");

-			exit(1);

-		    }

-

-		    logg("Database correctly reloaded (%d viruses)\n", virnum);

-		    mdprintf(acceptd, "RELOADED\n");

-		}

-

-	    } else if(!strncmp(buff, CMD5, strlen(CMD5))) { /* PING */

-		mdprintf(acceptd, "PONG\n");

-

-	    } else if(!strncmp(buff, CMD6, strlen(CMD6))) { /* CONTSCAN */

-		session[i] = procscan(buff + strlen(CMD6) + 1, root, &limits, options, copt, acceptd, 1);

-

-	    } else if(!strncmp(buff, CMD7, strlen(CMD7))) { /* VERSION */

-		mdprintf(acceptd, "clamd / ClamAV version "VERSION"\n");

-

-	    } else if(!strncmp(buff, CMD8, strlen(CMD8))) { /* STREAM */

-		session[i] = procscan(NULL, root, &limits, options, copt, acceptd, 0);

-	    }

-	}

-

-	close(acceptd);

-    }

-}

-

-void sighandler(int sig)

-{

-	time_t currtime;

-

-    switch(sig) {

-	case SIGINT:

-	case SIGTERM:

-	    time(&currtime);

-	    logg("--- Process %d stopped at %s", getpid(), ctime(&currtime));

-	    exit(0);

-	    break; /* not reached */

-

-#ifndef CL_DEBUG

-	case SIGSEGV:

-	    logg("Segmentation fault :-( Bye..\n");

-	    exit(11); /* probably not reached at all */

-	    break; /* not reached */

-#endif

-	case SIGHUP:

-	    sighup = 1;

-	    logg("SIGHUP catched: log file re-opened.\n");

-	    break;

-	case SIGALRM:

-	    if(acceptd > 0)

-		mdprintf(acceptd, "Session (PID %d): Time out ERROR\n", getpid());

-	    logg("Session (PID %d) stopped due to timeout.\n", getpid());

-	    exit(0);

-    }

-}

@@ -187,7 +187,9 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

 	sigset_t sigset;

 	client_conn_t *client_conn;

 	struct cfgstruct *cpt;

-	/* char *buff[BUFFSIZE+1]; */

+#ifdef HAVE_STRERROR_R

+	char buff[BUFFSIZE + 1];

+#endif

 	unsigned int selfchk;

 	time_t start_time, current_time;

 	pid_t mainpid;

@@ -398,9 +400,12 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop

     for(;;) {				

 	new_sd = accept(socketd, NULL, NULL);

 	if((new_sd == -1) && (errno != EINTR)) {

-	    logg("!accept() failed\n");

-	    /* logg("!accept() failed: %s", strerror_r(errno, buff, BUFFSIZE)); */

 	    /* very bad - need to exit or restart */

+#ifdef HAVE_STRERROR_R

+	    logg("!accept() failed: %s", strerror_r(errno, buff, BUFFSIZE));

+#else

+	    logg("!accept() failed\n");

+#endif

 	    continue;

 	}

@@ -8227,7 +8227,11 @@ _ACEOF

-for ac_func in poll

+

+

+

+

+for ac_func in poll setsid memcpy snprintf strerror_r

 do

 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

 echo "$as_me:$LINENO: checking for $ac_func" >&5

@@ -8715,84 +8719,6 @@ if test "${enable_clamuko+set}" = set; then

   want_clamuko="no"

 fi;

-

-

-

-for ac_func in setsid memcpy snprintf

-do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:$LINENO: checking for $ac_func" >&5

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

-if eval "test \"\${$as_ac_var+set}\" = set"; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-else

-  cat >conftest.$ac_ext <<_ACEOF

-#line $LINENO "configure"

-#include "confdefs.h"

-/* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */

-#include <assert.h>

-/* Override any gcc2 internal prototype to avoid an error.  */

-#ifdef __cplusplus

-extern "C"

-#endif

-/* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */

-char $ac_func ();

-char (*f) ();

-

-#ifdef F77_DUMMY_MAIN

-#  ifdef __cplusplus

-     extern "C"

-#  endif

-   int F77_DUMMY_MAIN() { return 1; }

-#endif

-int

-main ()

-{

-/* The GNU C library defines this for functions which it implements

-    to always fail with ENOSYS.  Some functions are actually named

-    something starting with __ and the normal name is an alias.  */

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

-choke me

-#else

-f = $ac_func;

-#endif

-

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

-  (eval $ac_link) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } &&

-         { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

-  (eval $ac_try) 2>&5

-  ac_status=$?

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); }; }; then

-  eval "$as_ac_var=yes"

-else

-  echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5

-eval "$as_ac_var=no"

-fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-fi

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

-if test `eval echo '${'$as_ac_var'}'` = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

-_ACEOF

-

-fi

-done

-

 echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5

 echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6

 if test "${ac_cv_func_setpgrp_void+set}" = set; then

@@ -57,7 +57,7 @@ AC_TYPE_OFF_T

 AC_COMPILE_CHECK_SIZEOF(short)

 AC_COMPILE_CHECK_SIZEOF(int)

 AC_COMPILE_CHECK_SIZEOF(long)

-AC_CHECK_FUNCS(poll)

+AC_CHECK_FUNCS(poll setsid memcpy snprintf strerror_r)

 have_pthreads=no

 AC_CHECK_HEADER(pthread.h,[have_pthreads=yes],)

@@ -80,7 +80,6 @@ AC_ARG_ENABLE(clamuko,

 [  --disable-clamuko	  Disable clamuko support (Linux and FreeBSD only)],

 want_clamuko="no",)

-AC_CHECK_FUNCS(setsid memcpy snprintf)

 AC_FUNC_SETPGRP

 have_milter="no"

@@ -298,76 +298,73 @@ struct Decode

 };

-struct MarkHeader MarkHead;

-struct NewMainArchiveHeader NewMhd;

-struct NewFileHeader NewLhd;

-struct BlockHeader BlockHead;

+static struct MarkHeader MarkHead;

+static struct NewMainArchiveHeader NewMhd;

+static struct NewFileHeader NewLhd;

+static struct BlockHeader BlockHead;

-UBYTE *TempMemory;                          /* temporary unpack-buffer      */

-char *CommMemory;

+static UBYTE *TempMemory;                          /* temporary unpack-buffer      */

+static char *CommMemory;

-UBYTE *UnpMemory;

-char ArgName[NM];                           /* current file in rar archive  */

-char ArcFileName[NM];                       /* file to decompress           */

+static UBYTE *UnpMemory;

+static char ArgName[NM];                           /* current file in rar archive  */

+static char ArcFileName[NM];                       /* file to decompress           */

 #ifdef _USE_MEMORY_TO_MEMORY_DECOMPRESSION  /* mem-to-mem decompression     */

-  MemoryFile *MemRARFile;                   /* pointer to RAR file in memory*/

+static  MemoryFile *MemRARFile;                   /* pointer to RAR file in memory*/

 #else

-  FILE *ArcPtr;                             /* input RAR file handler       */

+static  FILE *ArcPtr;                             /* input RAR file handler       */

 #endif

-char Password[255];                         /* password to decrypt files    */

+static char Password[255];                         /* password to decrypt files    */

-unsigned char *temp_output_buffer;          /* extract files to this pointer*/

-unsigned long *temp_output_buffer_offset;   /* size of temp. extract buffer */

+static unsigned char *temp_output_buffer;          /* extract files to this pointer*/

+static unsigned long *temp_output_buffer_offset;   /* size of temp. extract buffer */

-int MainHeadSize;

+static int MainHeadSize;

-long CurBlockPos,NextBlockPos;

+static long CurBlockPos,NextBlockPos;

-unsigned long CurUnpRead, CurUnpWrite;

-long UnpPackedSize;

-long DestUnpSize;

+static unsigned long CurUnpRead, CurUnpWrite;

+static long UnpPackedSize;

+static long DestUnpSize;

-UDWORD HeaderCRC;

-int Encryption;

+static UDWORD HeaderCRC;

+static int Encryption;

-unsigned int UnpWrSize;

-unsigned char *UnpWrAddr;

-unsigned int UnpPtr,WrPtr;

+static unsigned int UnpPtr,WrPtr;

-unsigned char PN1,PN2,PN3;

-unsigned short OldKey[4];

+static unsigned char PN1,PN2,PN3;

+static unsigned short OldKey[4];

 /* function header definitions                                              */

-int ReadHeader(int BlockType);

-BOOL ExtrFile(int desc);

-BOOL ListFile(void);

-int tread(void *stream,void *buf,unsigned len);

-int tseek(void *stream,long offset,int fromwhere);

-BOOL UnstoreFile(void);

-int IsArchive(void);

-int ReadBlock(int BlockType);

-unsigned int UnpRead(unsigned char *Addr,unsigned int Count);

-void UnpInitData(void);

-void Unpack(unsigned char *UnpAddr, BOOL FileFound);

-UBYTE DecodeAudio(int Delta);

+static int ReadHeader(int BlockType);

+static BOOL ExtrFile(int desc);

+static int tread(void *stream,void *buf,unsigned len);

+static int tseek(void *stream,long offset,int fromwhere);

+static BOOL UnstoreFile(void);

+static int IsArchive(void);

+static int ReadBlock(int BlockType);

+static unsigned int UnpRead(unsigned char *Addr,unsigned int Count);

+static void UnpInitData(void);

+static void Unpack(unsigned char *UnpAddr, BOOL FileFound);

+static UBYTE DecodeAudio(int Delta);

 static void DecodeNumber(struct Decode *Dec);

-void UpdKeys(UBYTE *Buf);

-void SetCryptKeys(char *Password);

-void SetOldKeys(char *Password);

-void DecryptBlock(unsigned char *Buf);

-void InitCRC(void);

-UDWORD CalcCRC32(UDWORD StartCRC,UBYTE *Addr,UDWORD Size);

-void UnpReadBuf(int FirstBuf);

-void ReadTables(void);

+static void UpdKeys(UBYTE *Buf);

+static void SetCryptKeys(char* NewPassword);

+static void SetOldKeys(char *NewPassword);

+static void DecryptBlock(unsigned char *Buf);

+static void InitCRC(void);

+static UDWORD CalcCRC32(UDWORD StartCRC,UBYTE *Addr,UDWORD Size);

+static void UnpReadBuf(int FirstBuf);

+static void ReadTables(void);

 static void ReadLastTables(void);

 static void MakeDecodeTables(unsigned char *LenTab,

                              struct Decode *Dec,

                              int Size);

-int stricomp(char *Str1,char *Str2);

+static int stricomp(char *Str1,char *Str2);

 /* ------------------------------------------------------------------------ */

@@ -1151,7 +1148,7 @@ int tseek(void *stream,long offset,int fromwhere)

 #endif

-char* strupper(char *Str)

+static char* strupper(char *Str)

 {

   char *ChPtr;

   for (ChPtr=Str;*ChPtr;ChPtr++)

@@ -1282,7 +1279,7 @@ struct AudioVariables

 #define MC 257

-struct AudioVariables AudV[4];

+static struct AudioVariables AudV[4];

 #define GetBits()                                                 \

         BitField = ( ( ( (UDWORD)InBuf[InAddr]   << 16 ) |        \

@@ -1299,19 +1296,19 @@ static unsigned char *UnpBuf;

 static unsigned int BitField;

 static unsigned int Number;

-unsigned char InBuf[8192];                  /* input read buffer            */

+static unsigned char InBuf[8192];                  /* input read buffer            */

-unsigned char UnpOldTable[MC*4];

+static unsigned char UnpOldTable[MC*4];

-unsigned int InAddr,InBit,ReadTop;

+static unsigned int InAddr,InBit,ReadTop;

-unsigned int LastDist,LastLength;

+static unsigned int LastDist,LastLength;

 static unsigned int Length,Distance;

-unsigned int OldDist[4],OldDistPtr;

+static unsigned int OldDist[4],OldDistPtr;

-struct LitDecode

+static struct LitDecode

 {

   unsigned int MaxNum;

   unsigned int DecodeLen[16];

@@ -1319,7 +1316,7 @@ struct LitDecode

   unsigned int DecodeNum[NC];

 } LD;

-struct DistDecode

+static struct DistDecode

 {

   unsigned int MaxNum;

   unsigned int DecodeLen[16];

@@ -1327,7 +1324,7 @@ struct DistDecode

   unsigned int DecodeNum[DC];

 } DD;

-struct RepDecode

+static struct RepDecode

 {

   unsigned int MaxNum;

   unsigned int DecodeLen[16];

@@ -1335,7 +1332,7 @@ struct RepDecode

   unsigned int DecodeNum[RC];

 } RD;

-struct MultDecode

+static struct MultDecode

 {

   unsigned int MaxNum;

   unsigned int DecodeLen[16];

@@ -1343,7 +1340,7 @@ struct MultDecode

   unsigned int DecodeNum[MC];

 } MD[4];

-struct BitDecode

+static struct BitDecode

 {

   unsigned int MaxNum;

   unsigned int DecodeLen[16];

@@ -1353,7 +1350,7 @@ struct BitDecode

 static struct MultDecode *MDPtr[4]={&MD[0],&MD[1],&MD[2],&MD[3]};

-int UnpAudioBlock,UnpChannels,CurChannel,ChannelDelta;

+static int UnpAudioBlock,UnpChannels,CurChannel,ChannelDelta;

 void Unpack(unsigned char *UnpAddr, BOOL FileFound)

@@ -2345,10 +2342,10 @@ UBYTE DecodeAudio(int Delta)

            ((UDWORD)SubstTable[(int)(t>>24)&255]<<24) )

-UDWORD CRCTab[256];

+static UDWORD CRCTab[256];

-UBYTE SubstTable[256];

-UBYTE InitSubstTable[256]={

+static UBYTE SubstTable[256];

+static const UBYTE InitSubstTable[256]={

   215, 19,149, 35, 73,197,192,205,249, 28, 16,119, 48,221,  2, 42,

   232,  1,177,233, 14, 88,219, 25,223,195,244, 90, 87,239,153,137,

   255,199,147, 70, 92, 66,246, 13,216, 40, 62, 29,217,230, 86,  6,

@@ -2367,10 +2364,10 @@ UBYTE InitSubstTable[256]={

   116,184,160, 96,109, 37, 30,106,140,104,150,  5,204,117,112, 84

 };

-UDWORD Key[4];

+static UDWORD Key[4];

-void EncryptBlock(UBYTE *Buf)

+static void EncryptBlock(UBYTE *Buf)

 {

   int I;

@@ -2511,7 +2508,7 @@ void UpdKeys(UBYTE *Buf)

   }

 }

-void SetCryptKeys(char *Password)

+static void SetCryptKeys(char *NewPassword)

 {

   unsigned int I,J,K,PswLength;

   unsigned char N1,N2;

@@ -2521,15 +2518,15 @@ void SetCryptKeys(char *Password)

   UBYTE Ch;

 #endif

-  SetOldKeys(Password);

+  SetOldKeys(NewPassword);

   Key[0]=0xD3A3B879L;

   Key[1]=0x3F6D12F7L;

   Key[2]=0x7515A235L;

   Key[3]=0xA4E7F123L;

   memset(Psw,0,sizeof(Psw));

-  strcpy((char *)Psw,Password);

-  PswLength=strlen(Password);

+  strcpy((char *)Psw,NewPassword);

+  PswLength=strlen(NewPassword);

   memcpy(SubstTable,InitSubstTable,sizeof(SubstTable));

   for (J=0;J<256;J++)

@@ -2603,16 +2600,16 @@ void SetCryptKeys(char *Password)

 }

-void SetOldKeys(char *Password)

+void SetOldKeys(char *NewPassword)

 {

   UDWORD PswCRC;

   UBYTE Ch;

-  PswCRC=CalcCRC32(0xFFFFFFFFL,(UBYTE*)Password,strlen(Password));

+  PswCRC=CalcCRC32(0xFFFFFFFFL,(UBYTE*)NewPassword,strlen(NewPassword));

   OldKey[0]=(UWORD)PswCRC;

   OldKey[1]=(UWORD)(PswCRC>>16);

   OldKey[2]=OldKey[3]=0;

   PN1=PN2=PN3=0;

-  while ((Ch=*Password)!=0)

+  while ((Ch=*NewPassword)!=0)

   {

     PN1+=Ch;

     PN2^=Ch;

@@ -2620,7 +2617,7 @@ void SetOldKeys(char *Password)

     PN3=(UBYTE)rol(PN3,1);

     OldKey[2]^=((UWORD)(Ch^CRCTab[Ch]));

     OldKey[3]+=((UWORD)(Ch+(CRCTab[Ch]>>16)));

-    Password++;

+    NewPassword++;

   }

 }

@@ -2642,7 +2639,7 @@ void InitCRC(void)

 }

-UDWORD CalcCRC32(UDWORD StartCRC,UBYTE *Addr,UDWORD Size)

+static UDWORD CalcCRC32(UDWORD StartCRC,UBYTE *Addr,UDWORD Size)

 {

   unsigned int I;

   for (I=0; I<Size; I++)