cosmetic fixes

git-svn: trunk@1014

clamav-devel/ChangeLog

@@ -1,6 +1,10 @@
+Sun Oct 17 02:42:10 CEST 2004 (tk)
+----------------------------------
+  * libclamav, freshclam: cosmetic fixes
+
 Sun Oct 17 01:28:48 CEST 2004 (tk)
 ----------------------------------
-  * libclamav: count unpacked data scanned with cl_scanbuff()
+  * libclamav: count unpacked data scanned by cl_scanbuff()
 
 Sat Oct 16 20:11:15 BST 2004 (njh)
 ----------------------------------

clamav-devel/freshclam/manager.c

@@ -195,10 +195,10 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna
 		mprintf("*Software version from DNS: %s\n", pt);
 		if(!strstr(cl_retver(), "devel")) {
 		    if(strcmp(cl_retver(), pt)) {
-			mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");
-			mprintf("WARNING: Local version: %s, Recommended version: %s\n", cl_retver(), pt);
-			logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");
-			logg("WARNING: Local version: %s, Recommended version: %s\n", cl_retver(), pt);
+			mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately!\n");
+			mprintf("WARNING: Local version: %s Recommended version: %sin", cl_retver(), pt);
+			logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately!\n");
+			logg("WARNING: Local version: %s Recommended version: %sin", cl_retver(), pt);
 		    }
 		}
 		free(pt);
@@ -271,9 +271,9 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna
 
 	if(flevel < current->fl) {
 	    /* display warning even for already installed database */
-	    mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");
+	    mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately!\n");
 	    mprintf("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);
-	    logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");
+	    logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately!\n");
 	    logg("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);
 	}
 
@@ -302,8 +302,8 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna
 	return 52;
     };
 
-    /* the temporary file is created in a directory owned by clamav so a race
-     * condition is not possible
+    /* the temporary file is created in a directory owned by clamav so race
+     * conditions are not possible
      */
     tempname = cli_gentemp(".");
 
@@ -353,9 +353,9 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna
     logg("%s updated (version: %d, sigs: %d, f-level: %d, builder: %s)\n", localname, current->version, current->sigs, current->fl, current->builder);
 
     if(flevel < current->fl) {
-	mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");
+	mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately!\n");
 	mprintf("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);
-	logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");
+	logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately!\n");
 	logg("WARNING: Current functionality level = %d, required = %d\n", flevel, current->fl);
     }
 
@@ -576,8 +576,11 @@ int get_database(const char *dbfile, int socketfd, const char *file, const char
 #else
     if((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0644)) == -1) {
 #endif
-	mprintf("@Can't open new file %s to write\n", file);
-	perror("open");
+	    char currdir[512];
+
+	getcwd(currdir, sizeof(currdir));
+	mprintf("@Can't create new file %s in %s\n", file, currdir);
+	mprintf("@The database directory must be writable for UID %d or GID %d\n", getuid(), getgid());
 	return 57;
     }
 

clamav-devel/libclamav/special.c

@@ -20,6 +20,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <netinet/in.h>
 
 #include "clamav.h"
 #include "others.h"

clamav-devel/libclamav/unrarlib.c

@@ -344,7 +344,7 @@ 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 BOOL UnstoreFile(void); */
 static int IsArchive(void);
 static int ReadBlock(int BlockType);
 static unsigned int UnpRead(unsigned char *Addr,unsigned int Count);
@@ -1250,6 +1250,7 @@ int stricomp(char *Str1,char *Str2)
  * ** unpack stored RAR files **
  * *****************************/
 
+/*
 BOOL UnstoreFile(void)
 {
   if ((long)(*temp_output_buffer_offset=UnpRead(temp_output_buffer,
@@ -1260,8 +1261,7 @@ BOOL UnstoreFile(void)
   }
   return TRUE;
 }
-
-
+*/
 
 
 /* ****************************************

clamav-devel/shared/output.c

@@ -122,7 +122,7 @@ int logg(const char *str, ...)
 #ifdef CL_THREAD_SAFE
 		pthread_mutex_unlock(&logg_mutex);
 #endif
-		printf("ERROR: Can't open %s in append mode.\n", logg_file);
+		printf("ERROR: Can't open %s in append mode (check permissions!).\n", logg_file);
 		return -1;
 	    } else umask(old_umask);