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

+Wed Oct 20 23:51:46 CEST 2004 (tk)

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

+  * clamd, clamscan: do not initialise procdev when /proc is not mounted

+		     (thanks to Andrey J. Melnikoff (TEMHOTA) <temnota*kmv.ru>)

+

 Wed Oct 20 22:37:24 CEST 2004 (tk)

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

   * shared/misc.c: print version information to stdin instead of stderr

@@ -176,9 +176,8 @@ void clamd(struct optstruct *opt)

     logg("*Verbose logging activated.\n");

 #ifdef C_LINUX

-    if(stat("/proc", &sb) == -1)

-	procdev = 0;

-    else

+    procdev = 0;

+    if(stat("/proc", &sb) != -1 && !sb.st_size)

 	procdev = sb.st_dev;

 #endif

@@ -81,7 +81,7 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 	struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #ifdef C_SOLARIS

-	char result[sizeof(struct dirent) + MAX_PATH + 1];

+	char result[sizeof(struct dirent) + PATH_MAX + 1];

 #else

 	struct dirent result;

 #endif

@@ -201,9 +201,8 @@ int scanmanager(const struct optstruct *opt)

     }

 #ifdef C_LINUX

-    if(stat("/proc", &sb) == -1)

-	procdev = 0;

-    else

+    procdev = 0;

+    if(stat("/proc", &sb) != -1 && !sb.st_size)

 	procdev = sb.st_dev;

 #endif

@@ -381,7 +381,7 @@ int cli_rmdirs(const char *dirname)

 	struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #ifdef C_SOLARIS

-	char result[sizeof(struct dirent) + MAX_PATH + 1];

+	char result[sizeof(struct dirent) + PATH_MAX + 1];

 #else

 	struct dirent result;

 #endif

@@ -737,7 +737,7 @@ int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo

 	struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #ifdef C_SOLARIS

-	char result[sizeof(struct dirent) + MAX_PATH + 1];

+	char result[sizeof(struct dirent) + PATH_MAX + 1];

 #else

 	struct dirent result;

 #endif

@@ -806,7 +806,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 	const struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #ifdef C_SOLARIS

-	char result[sizeof(struct dirent) + MAX_PATH + 1];

+	char result[sizeof(struct dirent) + PATH_MAX + 1];

 #else

 	struct dirent result;

 #endif

@@ -869,7 +869,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)

 	struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #ifdef C_SOLARIS

-	char result[sizeof(struct dirent) + MAX_PATH + 1];

+	char result[sizeof(struct dirent) + PATH_MAX + 1];

 #else

 	struct dirent result;

 #endif

@@ -760,7 +760,7 @@ static int cli_scandir(const char *dirname, const char **virname, long int *scan

 	struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #ifdef C_SOLARIS

-	char result[sizeof(struct dirent) + MAX_PATH + 1];

+	char result[sizeof(struct dirent) + PATH_MAX + 1];

 #else

 	struct dirent result;

 #endif

@@ -824,7 +824,7 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

 	struct dirent *dent;

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

 #ifdef C_SOLARIS

-	char result[sizeof(struct dirent) + MAX_PATH + 1];

+	char result[sizeof(struct dirent) + PATH_MAX + 1];

 #else

 	struct dirent result;

 #endif