@@ -191,7 +191,7 @@ void help(void)

     mprintf("    --version           -V             Print version number and exit\n");

     mprintf("    --verbose           -v             Be verbose\n");

     mprintf("    --quiet                            Be quiet, only output error messages\n");

-    mprintf("    --stdout                           Write to stdout instead of stderr\n");

+    mprintf("    --stdout                           Write to stdout instead of stderr. Does not affect 'debug' messages.\n");

     mprintf("                                       (this help is always written to stdout)\n");

     mprintf("    --log=FILE          -l FILE        Save scan report in FILE\n");

     mprintf("    --file-list=FILE    -f FILE        Scan files from FILE\n");

@@ -208,7 +208,7 @@ void help(void)

     mprintf("    --archive-verbose     -a             Show filenames inside scanned archives\n");

     mprintf("    --debug                              Enable libclamav's debug messages\n");

     mprintf("    --quiet                              Only output error messages\n");

-    mprintf("    --stdout                             Write to stdout instead of stderr\n");

+    mprintf("    --stdout                             Write to stdout instead of stderr. Does not affect 'debug' messages.\n");

     mprintf("    --no-summary                         Disable summary at end of scanning\n");

     mprintf("    --infected            -i             Only print infected files\n");

     mprintf("    --suppress-ok-results -o             Skip printing OK files\n");

@@ -46,6 +46,10 @@

 #include <grp.h>

 #endif

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

+#include <syslog.h>

+#endif

+

 #include "target.h"

 #include "clamav.h"

 #include "libfreshclam/libfreshclam.h"

@@ -147,7 +151,7 @@ static void help(void)

     mprintf("    --debug                              Enable debug messages\n");

     mprintf("    --quiet                              Only output error messages\n");

     mprintf("    --no-warnings                        Don't print and log warnings\n");

-    mprintf("    --stdout                             Write to stdout instead of stderr\n");

+    mprintf("    --stdout                             Write to stdout instead of stderr. Does not affect 'debug' messages.\n");

     mprintf("    --show-progress                      Show download progress percentage\n");

     mprintf("\n");

     mprintf("    --config-file=FILE                   Read configuration from FILE.\n");

@@ -172,7 +176,7 @@ static void help(void)

     mprintf("\n");

 }

-static void msg_callback(enum cl_msg severity, const char *fullmsg, const char *msg, void *ctx)

+static void libclamav_msg_callback(enum cl_msg severity, const char *fullmsg, const char *msg, void *ctx)

 {

     UNUSEDPARAM(fullmsg);

     UNUSEDPARAM(ctx);

@@ -190,6 +194,20 @@ static void msg_callback(enum cl_msg severity, const char *fullmsg, const char *

     }

 }

+static void libclamav_msg_callback_quiet(enum cl_msg severity, const char *fullmsg, const char *msg, void *ctx)

+{

+    UNUSEDPARAM(fullmsg);

+    UNUSEDPARAM(ctx);

+

+    switch (severity) {

+        case CL_MSG_ERROR:

+            logg("^[LibClamAV] %s", msg);

+            break;

+        default:

+            break;

+    }

+}

+

 fc_error_t download_complete_callback(const char *dbFilename, void *context)

 {

     fc_error_t status = FC_EARG;

@@ -749,46 +767,91 @@ static fc_error_t initialize(struct optstruct *opts)

         goto done;

     }

-    /* Set libclamav message callback. */

-    cl_set_clcb_msg(msg_callback);

-

     /*

      * Identify libfreshclam config options.

      */

-    /* Set libclamav Message option flags. */

+    /* Set libclamav Message and [file-based] Logging option flags.

+       mprintf and logg options are also directly set, as they are also

+       used in freshclam (not only used in libfreshclam) */

     if (optget(opts, "Debug")->enabled || optget(opts, "debug")->enabled)

         fcConfig.msgFlags |= FC_CONFIG_MSG_DEBUG;

-    if (optget(opts, "verbose")->enabled)

+

+    if ((optget(opts, "verbose")->enabled) ||

+        (optget(opts, "LogVerbose")->enabled)) {

         fcConfig.msgFlags |= FC_CONFIG_MSG_VERBOSE;

-    if (optget(opts, "quiet")->enabled)

+        fcConfig.logFlags |= FC_CONFIG_LOG_VERBOSE;

+        mprintf_verbose = 1;

+        logg_verbose    = 1;

+    }

+

+    if (optget(opts, "quiet")->enabled) {

         fcConfig.msgFlags |= FC_CONFIG_MSG_QUIET;

-    if (optget(opts, "no-warnings")->enabled)

+        mprintf_quiet = 1;

+        /* Silence libclamav messages. */

+        cl_set_clcb_msg(libclamav_msg_callback_quiet);

+    } else {

+        /* Enable libclamav messages, with [LibClamAV] message prefix. */

+        cl_set_clcb_msg(libclamav_msg_callback);

+    }

+

+    if (optget(opts, "no-warnings")->enabled) {

         fcConfig.msgFlags |= FC_CONFIG_MSG_NOWARN;

-    if (optget(opts, "stdout")->enabled)

+        fcConfig.logFlags |= FC_CONFIG_LOG_NOWARN;

+        mprintf_nowarn = 1;

+        logg_nowarn    = 1;

+    }

+

+    if (optget(opts, "stdout")->enabled) {

         fcConfig.msgFlags |= FC_CONFIG_MSG_STDOUT;

-    if (optget(opts, "show-progress")->enabled)

+        mprintf_stdout = 1;

+    }

+

+    if (optget(opts, "show-progress")->enabled) {

         fcConfig.msgFlags |= FC_CONFIG_MSG_SHOWPROGRESS;

+        mprintf_progress = 1;

+    }

-    /* Set libclamav [file-based] Logging option flags. */

-    if (mprintf_verbose ? 1 : optget(opts, "LogVerbose")->enabled)

-        fcConfig.logFlags |= FC_CONFIG_LOG_VERBOSE;

-    if (optget(opts, "LogTime")->enabled)

+    if (optget(opts, "LogTime")->enabled) {

         fcConfig.logFlags |= FC_CONFIG_LOG_TIME;

-    if (optget(opts, "LogFileMaxSize")->numarg && optget(opts, "LogRotate")->enabled)

+        logg_time = 1;

+    }

+    if (optget(opts, "LogFileMaxSize")->numarg && optget(opts, "LogRotate")->enabled) {

         fcConfig.logFlags |= FC_CONFIG_LOG_ROTATE;

+        logg_rotate = 1;

+    }

     if (optget(opts, "LogSyslog")->enabled)

         fcConfig.logFlags |= FC_CONFIG_LOG_SYSLOG;

     logFileOpt = optget(opts, "UpdateLogFile");

-    if (logFileOpt->enabled)

+    if (logFileOpt->enabled) {

         fcConfig.logFile = logFileOpt->strarg;

-    if (optget(opts, "LogFileMaxSize")->numarg)

+        logg_file        = cli_strdup(fcConfig.logFile);

+        if (0 != logg("#--------------------------------------\n")) {

+            mprintf("!Problem with internal logger (UpdateLogFile = %s).\n", logg_file);

+            status = FC_ELOGGING;

+            goto done;

+        }

+    }

+    if (optget(opts, "LogFileMaxSize")->numarg) {

         fcConfig.maxLogSize = optget(opts, "LogFileMaxSize")->numarg;

+        logg_size           = 1;

+    }

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

     if (optget(opts, "LogSyslog")->enabled) {

-        if (optget(opts, "LogFacility")->enabled)

+        if (optget(opts, "LogFacility")->enabled) {

+            int logFacility = LOG_LOCAL6;

+

             fcConfig.logFacility = optget(opts, "LogFacility")->strarg;

+            if ((NULL != fcConfig.logFacility) && (-1 == (logFacility = logg_facility(fcConfig.logFacility)))) {

+                mprintf("!LogFacility: %s: No such facility.\n", fcConfig.logFacility);

+                status = FC_ELOGGING;

+                goto done;

+            }

+

+            openlog("freshclam", LOG_PID, logFacility);

+            logg_syslog = 1;

+        }

     }

 #endif

@@ -896,7 +959,7 @@ static fc_error_t initialize(struct optstruct *opts)

      */

     ret = switch_user(optget(opts, "DatabaseOwner")->strarg);

     if (FC_SUCCESS != ret) {

-        logg("!Failedd to switch to %s user.\n", optget(opts, "DatabaseOwner")->strarg);

+        logg("!Failed to switch to %s user.\n", optget(opts, "DatabaseOwner")->strarg);

         status = ret;

         goto done;

     }

@@ -1560,15 +1560,15 @@ static cl_error_t asn1_parse_mscat(struct cl_engine *engine, fmap_t *map, size_t

                         // Change this so that raw is only populated when the

                         // debug flag is set, and then copy/display the full

                         // contents.

-                        cli_dbgmsg_internal("cert:\n");

-                        cli_dbgmsg_internal("  subject: %s\n", subject);

-                        cli_dbgmsg_internal("  serial: %s\n", serial);

-                        cli_dbgmsg_internal("  pubkey: %s\n", mod);

-                        cli_dbgmsg_internal("  i: %s %lu->%lu %s%s%s\n", issuer, (unsigned long)x509->not_before, (unsigned long)x509->not_after, x509->codeSign ? "code " : "", x509->timeSign ? "time " : "", x509->certSign ? "cert " : "");

-                        cli_dbgmsg_internal("  ==============RAW==============\n");

-                        cli_dbgmsg_internal("  raw_subject: %s\n", raw_subject);

-                        cli_dbgmsg_internal("  raw_serial: %s\n", raw_serial);

-                        cli_dbgmsg_internal("  raw_issuer: %s\n", raw_issuer);

+                        cli_dbgmsg("cert:\n");

+                        cli_dbgmsg("  subject: %s\n", subject);

+                        cli_dbgmsg("  serial: %s\n", serial);

+                        cli_dbgmsg("  pubkey: %s\n", mod);

+                        cli_dbgmsg("  i: %s %lu->%lu %s%s%s\n", issuer, (unsigned long)x509->not_before, (unsigned long)x509->not_after, x509->codeSign ? "code " : "", x509->timeSign ? "time " : "", x509->certSign ? "cert " : "");

+                        cli_dbgmsg("  ==============RAW==============\n");

+                        cli_dbgmsg("  raw_subject: %s\n", raw_subject);

+                        cli_dbgmsg("  raw_serial: %s\n", raw_serial);

+                        cli_dbgmsg("  raw_issuer: %s\n", raw_issuer);

                         x509 = x509->next;

                     }

@@ -141,7 +141,8 @@ fc_error_t fc_initialize(fc_config *fcConfig)

     logg_time    = (fcConfig->logFlags & FC_CONFIG_LOG_TIME) ? 1 : 0;

     logg_rotate  = (fcConfig->logFlags & FC_CONFIG_LOG_ROTATE) ? 1 : 0;

     logg_size    = fcConfig->maxLogSize;

-    if (NULL != fcConfig->logFile) {

+    /* Set a log file if requested, and is not already set */

+    if ((NULL == logg_file) && (NULL != fcConfig->logFile)) {

         logg_file = cli_strdup(fcConfig->logFile);

         if (0 != logg("#--------------------------------------\n")) {

             mprintf("!Problem with internal logger (UpdateLogFile = %s).\n", logg_file);

@@ -151,10 +152,10 @@ fc_error_t fc_initialize(fc_config *fcConfig)

     }

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

-    /* Initialize syslog if available and requested */

+    /* Initialize syslog if available and requested, and is not already set */

     if (fcConfig->logFlags & FC_CONFIG_LOG_SYSLOG) {

         int logFacility = LOG_LOCAL6;

-        if ((NULL != fcConfig->logFacility) && (-1 == (logFacility = logg_facility(fcConfig->logFacility)))) {

+        if ((0 == logg_syslog) && (NULL != fcConfig->logFacility) && (-1 == (logFacility = logg_facility(fcConfig->logFacility)))) {

             mprintf("!LogFacility: %s: No such facility.\n", fcConfig->logFacility);

             status = FC_ELOGGING;

             goto done;

@@ -232,7 +232,7 @@ static int rename_logg(STATBUF *sb)

     }

     t = time(NULL);

-    

+

 #ifdef _WIN32

     if (0 != localtime_s(&t, &tmp)) {

 #else

@@ -477,19 +477,19 @@ void mprintf(const char *str, ...)

     fd = stdout;

     /* legend:

- * ! - error

- * @ - error with logging

- * ...

- */

+     * ! - error

+     * @ - error with logging

+     * ...

+     */

     /*

- *             ERROR    WARNING    STANDARD

- * normal      stderr   stderr     stdout

- * 

- * verbose     stderr   stderr     stdout

- * 

- * quiet       stderr     no         no

- */

+     *             ERROR    WARNING    STANDARD

+     * normal      stderr   stderr     stdout

+     *

+     * verbose     stderr   stderr     stdout

+     *

+     * quiet       stderr     no         no

+     */

     ARGLEN(args, str, len);

     if (len <= sizeof(buffer)) {

@@ -3508,7 +3508,7 @@ static void help(void)

     mprintf("    --version              -V              Print version number and exit\n");

     mprintf("    --quiet                                Be quiet, output only error messages\n");

     mprintf("    --debug                                Enable debug messages\n");

-    mprintf("    --stdout                               Write to stdout instead of stderr\n");

+    mprintf("    --stdout                               Write to stdout instead of stderr. Does not affect 'debug' messages.\n");

     mprintf("    --hex-dump                             Convert data from stdin to a hex\n");

     mprintf("                                           string and print it on stdout\n");

     mprintf("    --md5 [FILES]                          Generate MD5 checksum from stdin\n");