[Openvas-commits] r13762 - in trunk/openvas-libraries: . misc

[scm-commit at wald.intevation.org]

Author: werner
Date: 2012-07-20 10:53:51 +0200 (Fri, 20 Jul 2012)
New Revision: 13762

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/misc/openvas_logging.c
Log:
2012-07-20  Werner Koch  <wk at gnupg.org>

	* misc/openvas_logging.c (openvas_log_func): Trim off extra LF
	from MESSAGE to avoid empty lines in the log.  Replace g_string
	hack by a single g_strdup_printf.



Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2012-07-19 19:26:41 UTC (rev 13761)
+++ trunk/openvas-libraries/ChangeLog	2012-07-20 08:53:51 UTC (rev 13762)
@@ -1,3 +1,9 @@
+2012-07-20  Werner Koch  <wk at gnupg.org>
+
+	* misc/openvas_logging.c (openvas_log_func): Trim off extra LF
+	from MESSAGE to avoid empty lines in the log.  Replace g_string
+	hack by a single g_strdup_printf.
+
 2012-07-04  Sascha Wilde  <wilde at intevation.de>
 
 	* omp/omp.c (OMP_FMT_BOOL_ATTRIB): New define.

Modified: trunk/openvas-libraries/misc/openvas_logging.c
===================================================================
--- trunk/openvas-libraries/misc/openvas_logging.c	2012-07-19 19:26:41 UTC (rev 13761)
+++ trunk/openvas-libraries/misc/openvas_logging.c	2012-07-20 08:53:51 UTC (rev 13762)
@@ -353,6 +353,8 @@
   gchar *prepend_tmp;
   gchar *prepend_tmp1;
   gchar *tmp;
+  gchar *tmpstr;
+  int messagelen;
 
   /* For link list operations. */
   GSList *log_domain_list_tmp;
@@ -558,15 +560,18 @@
       break;
     }
 
-  /* If the current log entry is more severe than the specified log level,
-   * print out the message.
+  /* If the current log entry is more severe than the specified log
+   * level, print out the message.  In case MESSAGE already ends in a
+   * LF and there is not only the LF, remove the LF to avoid empty
+   * lines in the log.
    */
-  GString *log_str = g_string_new ("");
-  g_string_append_printf (log_str, "%s%s%s%s %s\n",
-                          log_domain ? log_domain : "", log_separator, prepend,
-                          log_separator, message);
+  messagelen = message? strlen (message) : 0;
+  if (messagelen > 1 && message[messagelen-1] == '\n')
+    messagelen--;
+  tmpstr = g_strdup_printf ("%s%s%s%s %.*s\n",
+                            log_domain ? log_domain : "", log_separator,
+                            prepend, log_separator, messagelen, message);
 
-  gchar *tmpstr = g_string_free (log_str, FALSE);
   /* Output everything to stderr if logfile is "-". */
   if (g_ascii_strcasecmp (log_file, "-") == 0)
     {