`buckettools -c' now uses fastbufs for output.

[libucw.git] / lib / log.c

diff --git a/lib/log.c b/lib/log.c
index 882741cf48dfcde5bafd59e45eb784bc1f78ef8d..2f6e9fd57ecf05397fe9b936677da7d3112bd09c 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -16,9 +16,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <time.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <time.h>

+#include <alloca.h>

 
 static char log_progname[32], *log_name_patt, *log_name;
 
 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;
 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);
       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)
        {
          if (log_pid)

-           p += sprintf(p, "[%s (%d)] ", log_progname, log_pid);
+           p += sprintf(p, "[%s (%d)] ", log_title, log_pid);

          else
          else

-           p += sprintf(p, "[%s] ", log_progname);
+           p += sprintf(p, "[%s] ", log_title);

        }
       else
        {
        }
       else
        {


@@ -122,7 +124,11 @@ die(byte *msg, ...)
   va_start(args, msg);
   vlog(L_FATAL, msg, args);
   va_end(args);
   va_start(args, msg);
   vlog(L_FATAL, msg, args);
   va_end(args);

+#ifdef DEBUG_DIE_BY_ABORT
+  abort();
+#else

   exit(1);
   exit(1);

+#endif

 }
 
 #ifdef DEBUG
 }
 
 #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;
     {
       strncpy(log_progname, log_basename(argv0), sizeof(log_progname)-1);
       log_progname[sizeof(log_progname)-1] = 0;

+      log_title = log_progname;

     }
 }
 
     }
 }