From 8feb7e470177b0aa59b89946a9eb476e4c23ced6 Mon Sep 17 00:00:00 2001
From: Fred Kiefer <fredkiefer@gmx.de>
Date: Tue, 6 May 2014 22:22:34 +0000
Subject: [PATCH] * Tools/gpbs.m: Revert last change and correct the
 implementation   and usage of gpbs_log.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@37852 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog    |  7 ++++-
 Tools/gpbs.m | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 189701d..bc74fb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+2014-05-07  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Tools/gpbs.m: Revert last change and correct the implementation
+	and usage of gpbs_log.
+
 2014-05-06  Ivan Vucica <ivan@vucica.net>
 
 	* Tools/gpbs.m: Removed barely used, overly complex and almost
 	certainly buggy logging code.
-	
+
 2014-05-05  Ivan Vucica <ivan@vucica.net>
 
 	* ChangeLog: Corrected year for some recent commits.
diff --git a/Tools/gpbs.m b/Tools/gpbs.m
index f631969..bb6d359 100644
--- a/Tools/gpbs.m
+++ b/Tools/gpbs.m
@@ -54,6 +54,77 @@ static BOOL	auto_stop = NO;		/* Stop when all connections closed. */
 
 static NSMutableArray	*connections = nil;
 
+#if defined(HAVE_SYSLOG) || defined(HAVE_SLOGF)
+#  if defined(HAVE_SLOGF)
+#    include <sys/slogcodes.h>
+#    include <sys/slog.h>
+#    define LOG_CRIT _SLOG_CRITICAL
+#    define LOG_DEBUG _SLOG_DEBUG1
+#    define LOG_ERR _SLOG_ERROR
+#    define LOG_INFO _SLOG_INFO
+#    define LOG_WARNING _SLOG_WARNING
+#    define syslog(prio, msg,...) slogf(_SLOG_SETCODE(_SLOG_SYSLOG, 0), prio, msg, __VA_ARGS__)
+#  endif
+static int	log_priority = LOG_DEBUG;
+
+static void
+gpbs_log (int prio, const char *ebuf)
+{
+  if (is_daemon)
+    {
+#   if defined(HAVE_SLOGF)
+	  // Let's not have 0 as the value for prio. It means "shutdown" on QNX
+      syslog (prio ? prio : log_priority, "%s", ebuf);
+#   else
+      syslog (log_priority | prio, "%s", ebuf);
+#   endif
+    }
+  else if (prio == LOG_INFO)
+    {
+      write (1, ebuf, strlen (ebuf));
+      write (1, "\n", 1);
+    }
+  else
+    {
+      write (2, ebuf, strlen (ebuf));
+      write (2, "\n", 1);
+    }
+
+  if (prio == LOG_CRIT)
+    {
+      if (is_daemon)
+	{
+	  syslog (LOG_CRIT, "%s", "exiting.");
+	}
+      else
+     	{
+	  fprintf (stderr, "exiting.\n");
+	  fflush (stderr);
+	}
+      exit(EXIT_FAILURE);
+    }
+}
+#else
+
+#define	LOG_CRIT	2
+#define LOG_DEBUG	0
+#define LOG_ERR		1
+#define LOG_INFO	0
+#define LOG_WARNING	0
+void
+gpbs_log (int prio, const char *ebuf)
+{
+  write (2, ebuf, strlen (ebuf));
+  write (2, "\n", 1);
+  if (prio == LOG_CRIT)
+    {
+      fprintf (stderr, "exiting.\n");
+      fflush (stderr);
+      exit(EXIT_FAILURE);
+    }
+}
+#endif
+
 @class PasteboardServer;
 @class PasteboardObject;
 
@@ -1056,6 +1127,7 @@ if (beenHere == YES)
 static void
 init(int argc, char** argv, char **env)
 {
+  NSUserDefaults	*defs;
   NSProcessInfo		*pInfo;
   NSMutableArray	*args;
   unsigned		count;
@@ -1150,13 +1222,19 @@ init(int argc, char** argv, char **env)
 	}
       NS_HANDLER
 	{
-          NSLog(@"An exception has ocurred.");
+	  gpbs_log(LOG_CRIT, [[localException description] UTF8String]);
 	  DESTROY(t);
 	}
       NS_ENDHANDLER
       exit(EXIT_FAILURE);
     }
 
+  /*
+   * Make gpbs logging go to syslog unless overridden by user.
+   */
+  defs = [NSUserDefaults standardUserDefaults];
+  [defs registerDefaults: [NSDictionary dictionaryWithObjectsAndKeys:
+    @"YES", @"GSLogSyslog", nil]];
 }