1 files changed, 44 insertions, 24 deletions

diff --git a/src/verbose.c b/src/verbose.c
index 892aa9a3..53811c00 100644
--- a/src/verbose.c
+++ b/src/verbose.c
@@ -16,15 +16,38 @@
  limitations under the License.
 */
 
-#include "verbose.h"
-
-#if !defined(VERBOSE_WITH_SYSLOG)
-
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "verbose.h"
+
 int verbosity = 1;
 
+#define LEVEL(x) ((x) < 0 ? 0 : (x) > 7 ? 7 : (x))
+
+#if defined(VERBOSE_WITH_SYSLOG)
+
+#include <syslog.h>
+
+void vverbose(int level, const char *file, int line, const char *fmt, va_list args)
+{
+	char *p;
+
+	if (file == NULL || vasprintf(&p, fmt, args) < 0)
+		vsyslog(level, fmt, args);
+	else {
+		syslog(LEVEL(level), "%s [%s:%d]", p, file, line);
+		free(p);
+	}
+}
+
+void verbose_set_name(const char *name, int authority)
+{
+	openlog(name, LOG_PERROR, authority ? LOG_AUTH : LOG_USER);
+}
+
+#else
+
 static const char *prefixes[] = {
 	"<0> EMERGENCY",
 	"<1> ALERT",
@@ -36,32 +59,29 @@ static const char *prefixes[] = {
 	"<7> DEBUG"
 };
 
-void verbose(int level, const char *file, int line, const char *fmt, ...)
+void vverbose(int level, const char *file, int line, const char *fmt, va_list args)
 {
-	va_list ap;
-
-	fprintf(stderr, "%s: ", prefixes[level < 0 ? 0 : level > 7 ? 7 : level]);
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	fprintf(stderr, " [%s:%d]\n", file, line);
+	fprintf(stderr, "%s: ", prefixes[LEVEL(level)]);
+	vfprintf(stderr, fmt, args);
+	if (file != NULL)
+		fprintf(stderr, " [%s:%d]\n", file, line);
+	else
+		fprintf(stderr, "\n");
 }
 
-#endif
-
-#if defined(VERBOSE_WITH_SYSLOG) && !defined(NDEBUG)
-
-int verbosity = 1;
-
-#endif
-
-#if defined(VERBOSE_WITH_SYSLOG) && defined(NDEBUG)
-
-void verbose_error(const char *file, int line)
+void verbose_set_name(const char *name, int authority)
 {
-	syslog(LOG_ERR, "error file %s line %d", file, line);
+	fprintf(stderr, "%s: application name is '%s' for '%s'\n", prefixes[5], name, authority ? "AUTHORITY" : "USER");
 }
 
 #endif
 
+void verbose(int level, const char *file, int line, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vverbose(level, file, line, fmt, ap);
+	va_end(ap);
+}