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

+Wed Jan 23 17:15:28 CET 2008 (tk)

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

+  * shared/output.c: fix handling of special characters in mprintf/logg (bb#360)

+

 Wed Jan 23 17:19:59 EET 2008 (edwin)

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

  * libclamav/htmlnorm.c, entconv.c: optimize char reference handling

@@ -216,7 +216,7 @@ static int dirscan(const char *dirname, const char **virname, unsigned long int

 					if(scanret == CL_VIRUS) {

 					    mdprintf(odesc, "%s: %s FOUND\n", fname, *virname);

-					    logg("%s: %s FOUND\n", fname, *virname);

+					    logg("~%s: %s FOUND\n", fname, *virname);

 					    virusaction(fname, *virname, copt);

 					    if(type == TYPE_SCAN) {

 						closedir(dd);

@@ -227,7 +227,7 @@ static int dirscan(const char *dirname, const char **virname, unsigned long int

 					} else if(scanret != CL_CLEAN) {

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

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

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

 					    if(scanret == CL_EMEM) {

 						closedir(dd);

 						free(fname);

@@ -235,7 +235,7 @@ static int dirscan(const char *dirname, const char **virname, unsigned long int

 					    }

 					} else if(logok) {

-					    logg("%s: OK\n", fname);

+					    logg("~%s: OK\n", fname);

 					}

 					free(fname);

 				    }

@@ -277,13 +277,13 @@ static void multiscanfile(void *arg)

     if(ret == CL_VIRUS) {

 	mdprintf(tag->sd, "%s: %s FOUND\n", tag->fname, virname);

-	logg("%s: %s FOUND\n", tag->fname, virname);

+	logg("~%s: %s FOUND\n", tag->fname, virname);

 	virusaction(tag->fname, virname, tag->copt);

     } else if(ret != CL_CLEAN) {

 	mdprintf(tag->sd, "%s: %s ERROR\n", tag->fname, cl_strerror(ret));

-	logg("%s: %s ERROR\n", tag->fname, cl_strerror(ret));

+	logg("~%s: %s ERROR\n", tag->fname, cl_strerror(ret));

     } else if(logok) {

-	logg("%s: OK\n", tag->fname);

+	logg("~%s: OK\n", tag->fname);

     }

     free(tag->fname);

@@ -333,15 +333,15 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_engin

 	    if(ret == CL_VIRUS) {

 		mdprintf(odesc, "%s: %s FOUND\n", filename, virname);

-		logg("%s: %s FOUND\n", filename, virname);

+		logg("~%s: %s FOUND\n", filename, virname);

 		virusaction(filename, virname, copt);

 	    } else if(ret != CL_CLEAN) {

 		mdprintf(odesc, "%s: %s ERROR\n", filename, cl_strerror(ret));

-		logg("%s: %s ERROR\n", filename, cl_strerror(ret));

+		logg("~%s: %s ERROR\n", filename, cl_strerror(ret));

 		if(ret == CL_EMEM)

 		    return -2;

 	    } else if (logok) {

-		logg("%s: OK\n", filename);

+		logg("~%s: OK\n", filename);

 	    }

 	    break;

 	case S_IFDIR:

@@ -90,12 +90,12 @@ static int dsresult(int sockd, const struct optstruct *opt)

 		} else {

 		    *pt = 0;

 		    if(unlink(buff)) {

-			mprintf("%s: Can't remove.\n", buff);

-			logg("%s: Can't remove.\n", buff);

+			mprintf("~%s: Can't remove.\n", buff);

+			logg("~%s: Can't remove.\n", buff);

 			notremoved++;

 		    } else {

-			mprintf("%s: Removed.\n", buff);

-			logg("%s: Removed.\n", buff);

+			mprintf("~%s: Removed.\n", buff);

+			logg("~%s: Removed.\n", buff);

 		    }

 		}

 	    }

@@ -134,7 +134,7 @@ static int dsfile(int sockd, const char *scantype, const char *filename, const s

     ret = dsresult(sockd, opt);

     if(!ret)

-	logg("%s: OK\n", filename);

+	logg("~%s: OK\n", filename);

     return ret;

 }

@@ -626,7 +626,7 @@ static void move_infected(const char *filename, const struct optstruct *opt)

 	}

     }

-    logg("%s: %s to '%s'\n", filename, (moveflag) ? "moved" : "copied", movefilename);

+    logg("~%s: %s to '%s'\n", filename, (moveflag) ? "moved" : "copied", movefilename);

     free(movefilename);

 }

@@ -645,7 +645,7 @@ static int checkfile(const char *filename, const struct cl_engine *engine, const

     }

     if((ret = cl_scandesc(fd, &virname, &info.blocks, engine, limits, options)) == CL_VIRUS) {

-	logg("%s: %s FOUND\n", filename, virname);

+	logg("~%s: %s FOUND\n", filename, virname);

 	info.ifiles++;

 	if(bell)

@@ -653,10 +653,10 @@ static int checkfile(const char *filename, const struct cl_engine *engine, const

     } else if(ret == CL_CLEAN) {

 	if(!printinfected && printclean)

-	    mprintf("%s: OK\n", filename);

+	    mprintf("~%s: OK\n", filename);

     } else

 	if(!printinfected)

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

+	    logg("~%s: %s\n", filename, cl_strerror(ret));

     close(fd);

     return ret;

@@ -818,7 +818,7 @@ static int scancompressed(const char *filename, struct cl_engine *engine, const

 			logg("^%s: Can't remove\n", filename);

 			info.notremoved++;

 		    } else {

-			logg("%s: Removed\n", filename);

+			logg("~%s: Removed\n", filename);

 		    }

 		} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		    move_infected(filename, opt);

@@ -835,14 +835,14 @@ static int scancompressed(const char *filename, struct cl_engine *engine, const

 			logg("^%s: Can't remove\n", filename);

 			info.notremoved++;

 		    } else {

-			logg("%s: Removed\n", filename);

+			logg("~%s: Removed\n", filename);

 		    }

 		} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		    move_infected(filename, opt);

 	    }

 	    return ret;

 	case 1:

-	    logg("%s: Infected.Archive FOUND\n", filename);

+	    logg("~%s: Infected.Archive FOUND\n", filename);

 	    if(bell)

 		fprintf(stderr, "\007");

@@ -852,7 +852,7 @@ static int scancompressed(const char *filename, struct cl_engine *engine, const

 		    logg("^%s: Can't remove\n", filename);

 		    info.notremoved++;

 		} else {

-		    logg("%s: Removed\n", filename);

+		    logg("~%s: Removed\n", filename);

 		}

 	    } else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		move_infected(filename, opt);

@@ -933,7 +933,7 @@ static int scandenied(const char *filename, struct cl_engine *engine, const stru

 		logg("^%s: Can't remove\n", filename);

 		info.notremoved++;

 	    } else {

-	        logg("%s: Removed\n", filename);

+	        logg("~%s: Removed\n", filename);

 	    }

 	} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 	    move_infected(filename, opt);

@@ -961,7 +961,7 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd

 	if(stat(filename, &sb) != -1)

 	    if(sb.st_dev == procdev) {

 		if(!printinfected)

-		    logg("%s: Excluded (/proc)\n", filename);

+		    logg("~%s: Excluded (/proc)\n", filename);

 		return 0;

 	    }

 #endif    

@@ -971,7 +971,7 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd

 	while(argument) {

 	    if(match_regex(filename, argument) == 1) {

 		if(!printinfected)

-		    logg("%s: Excluded\n", filename);

+		    logg("~%s: Excluded\n", filename);

 		return 0;

 	    }

 	    argument = opt_nextarg(&optnode, "exclude");

@@ -991,14 +991,14 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd

 	if(!included) {

 	    if(!printinfected)

-		logg("%s: Excluded\n", filename);

+		logg("~%s: Excluded\n", filename);

 	    return 0;

 	}

     }

     if(fileinfo(filename, 1) == 0) {

 	if(!printinfected)

-	    logg("%s: Empty file\n", filename);

+	    logg("~%s: Empty file\n", filename);

 	return 0;

     }

@@ -1006,7 +1006,7 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd

     if(geteuid())

 	if(checkaccess(filename, NULL, R_OK) != 1) {

 	    if(!printinfected)

-		logg("%s: Access denied\n", filename);

+		logg("~%s: Access denied\n", filename);

 	    return 0;

 	}

 #endif

@@ -1028,7 +1028,7 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd

 		    logg("^%s: Can't remove\n", filename);

 		    info.notremoved++;

 		} else {

-		    logg("%s: Removed\n", filename);

+		    logg("~%s: Removed\n", filename);

 		}

 	    } else if (opt_check(opt, "move") || opt_check(opt, "copy"))

 		move_infected(filename, opt);

@@ -1092,7 +1092,7 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd

 		logg("^%s: Can't remove\n", filename);

 		info.notremoved++;

 	    } else {

-		logg("%s: Removed\n", filename);

+		logg("~%s: Removed\n", filename);

 	    }

 	} else if (opt_check(opt, "move") || opt_check(opt, "copy"))

             move_infected(filename, opt);

@@ -71,7 +71,7 @@ int treewalk(const char *dirname, struct cl_engine *engine, const struct passwd

 	while(argument) {

 	    if(match_regex(dirname, argument) == 1) {

 		if(!printinfected)

-		    logg("%s: Excluded\n", dirname);

+		    logg("~%s: Excluded\n", dirname);

 		return 0;

 	    }

 	    argument = opt_nextarg(&optnode, "exclude-dir");

@@ -91,7 +91,7 @@ int treewalk(const char *dirname, struct cl_engine *engine, const struct passwd

 	if(!included) {

 	    if(!printinfected)

-		logg("%s: Excluded\n", dirname);

+		logg("~%s: Excluded\n", dirname);

 	    return 0;

 	}

     }

@@ -135,7 +135,7 @@ int treewalk(const char *dirname, struct cl_engine *engine, const struct passwd

 	}

     } else {

 	if(!printinfected)

-	    logg("%s: Can't open directory.\n", dirname);

+	    logg("~%s: Can't open directory.\n", dirname);

 	return 53;

     }

@@ -237,7 +237,7 @@ int fixperms(const char *dirname)

 	}

     } else {

 	if(!printinfected)

-	    logg("%s: Can't open directory.\n", dirname);

+	    logg("~%s: Can't open directory.\n", dirname);

 	return 53;

     }

@@ -285,7 +285,7 @@ int du(const char *dirname, struct s_du *n)

 	}

     } else {

 	if(!printinfected)

-	    logg("%s: Can't open directory.\n", dirname);

+	    logg("~%s: Can't open directory.\n", dirname);

 	return 53;

     }

@@ -128,7 +128,7 @@ void logg_close(void) {

 int logg(const char *str, ...)

 {

-	va_list args, argscpy, argsout;

+	va_list args;

 #ifdef F_WRLCK

 	struct flock fl;

 #endif

@@ -139,9 +139,9 @@ int logg(const char *str, ...)

     va_start(args, str);

-    /* va_copy is less portable so we just use va_start once more */

-    va_start(argscpy, str);

-    va_start(argsout, str);

+    vsnprintf(vbuff, sizeof(vbuff), str, args);

+    va_end(args);

+    vbuff[1024] = 0;

 #ifdef CL_THREAD_SAFE

     pthread_mutex_lock(&logg_mutex);

@@ -188,7 +188,7 @@ int logg(const char *str, ...)

             /* Need to avoid logging time for verbose messages when logverbose

                is not set or we get a bunch of timestamps in the log without

                newlines... */

-	    if(logg_time && ((*str != '*') || logg_verbose)) {

+	    if(logg_time && ((*vbuff != '*') || logg_verbose)) {

 		time(&currtime);

 		pt = ctime(&currtime);

 		timestr = calloc(strlen(pt), 1);

@@ -197,22 +197,18 @@ int logg(const char *str, ...)

 		free(timestr);

 	    }

-	    _(str);

-	    if(*str == '!') {

-		fprintf(logg_fd, "ERROR: ");

-		vfprintf(logg_fd, str + 1, args);

-	    } else if(*str == '^') {

-		if(!logg_nowarn) {

-		    fprintf(logg_fd, "WARNING: ");

-		    vfprintf(logg_fd, str + 1, args);

-		}

-	    } else if(*str == '*') {

+	    if(*vbuff == '!') {

+		fprintf(logg_fd, "ERROR: %s", vbuff + 1);

+	    } else if(*vbuff == '^') {

+		if(!logg_nowarn)

+		    fprintf(logg_fd, "WARNING: %s", vbuff + 1);

+	    } else if(*vbuff == '*') {

 		if(logg_verbose)

-		    vfprintf(logg_fd, str + 1, args);

-	    } else if(*str == '#') {

-		vfprintf(logg_fd, str + 1, args);

-	    } else vfprintf(logg_fd, str, args);

-

+		    fprintf(logg_fd, "%s", vbuff + 1);

+	    } else if(*vbuff == '#' || *vbuff == '~') {

+		fprintf(logg_fd, "%s", vbuff + 1);

+	    } else

+		fprintf(logg_fd, "%s", vbuff);

 	    fflush(logg_fd);

 	}

@@ -220,10 +216,6 @@ int logg(const char *str, ...)

 #if defined(USE_SYSLOG) && !defined(C_AIX)

     if(logg_syslog) {

-        _(str);

-	vsnprintf(vbuff, 1024, str, argscpy);

-	vbuff[1024] = 0;

-

 	if(vbuff[0] == '!') {

 	    syslog(LOG_ERR, "%s", vbuff + 1);

 	} else if(vbuff[0] == '^') {

@@ -233,7 +225,7 @@ int logg(const char *str, ...)

 	    if(logg_verbose) {

 		syslog(LOG_DEBUG, "%s", vbuff + 1);

 	    }

-	} else if(vbuff[0] == '#') {

+	} else if(vbuff[0] == '#' || vbuff[0] == '~') {

 	    syslog(LOG_INFO, "%s", vbuff + 1);

 	} else syslog(LOG_INFO, "%s", vbuff);

@@ -241,9 +233,6 @@ int logg(const char *str, ...)

 #endif

     if(logg_foreground) {

-	_(str);

-        vsnprintf(vbuff, 1024, str, argsout);

-	vbuff[1024] = 0;

 	if(vbuff[0] != '#')

 	    mprintf("%s", vbuff);

     }

@@ -252,9 +241,6 @@ int logg(const char *str, ...)

     pthread_mutex_unlock(&logg_mutex);

 #endif

-    va_end(args);

-    va_end(argscpy);

-    va_end(argsout);

     return 0;

 }

@@ -307,6 +293,8 @@ void mprintf(const char *str, ...)

 	} else if(buff[0] == '*') {

 	    if(mprintf_verbose)

 		fprintf(fd, "%s", &buff[1]);

+	} else if(buff[0] == '~') {

+	    fprintf(fd, "%s", &buff[1]);

 	} else fprintf(fd, "%s", buff);

     }