X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flog.c;h=2f6e9fd57ecf05397fe9b936677da7d3112bd09c;hb=2cbdeacdc8f0fb3f4252c72a24407afba5788a6b;hp=882741cf48dfcde5bafd59e45eb784bc1f78ef8d;hpb=797a7cb79c39d8ff53a877c3af4d944eea56f0d3;p=libucw.git

diff --git a/lib/log.c b/lib/log.c
index 882741cf..2f6e9fd5 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -16,9 +16,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <time.h>
+#include <alloca.h>
 
 static char log_progname[32], *log_name_patt, *log_name;
-static pid_t log_pid;
+char *log_title;
+static int log_pid;
 static int log_params;
 static int log_name_size;
 static int log_switching;
@@ -71,12 +73,12 @@ vlog(unsigned int cat, const char *msg, va_list args)
       p = buf = alloca(buflen);
       *p++ = cat;
       p += strftime(p, buflen, " %Y-%m-%d %H:%M:%S ", tm);
-      if (log_progname[0])
+      if (log_title)
 	{
 	  if (log_pid)
-	    p += sprintf(p, "[%s (%d)] ", log_progname, log_pid);
+	    p += sprintf(p, "[%s (%d)] ", log_title, log_pid);
 	  else
-	    p += sprintf(p, "[%s] ", log_progname);
+	    p += sprintf(p, "[%s] ", log_title);
 	}
       else
 	{
@@ -122,7 +124,11 @@ die(byte *msg, ...)
   va_start(args, msg);
   vlog(L_FATAL, msg, args);
   va_end(args);
+#ifdef DEBUG_DIE_BY_ABORT
+  abort();
+#else
   exit(1);
+#endif
 }
 
 #ifdef DEBUG
@@ -158,6 +164,7 @@ log_init(byte *argv0)
     {
       strncpy(log_progname, log_basename(argv0), sizeof(log_progname)-1);
       log_progname[sizeof(log_progname)-1] = 0;
+      log_title = log_progname;
     }
 }