Changeset 481 for trunk/src/sh_log_parse_generic.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (10 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_log_parse_generic.c (modified) (2 diffs)

trunk/src/sh_log_parse_generic.c

@@ -46 +46 @@
 static void default_time (struct sh_logrecord * record)
 {
-  struct tm ts;
+  struct tm   ts;
+  struct tm * ts_ptr;
   char   tmp[80];
   size_t len;
@@ -53 +54 @@
   
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_LOCALTIME_R)
-  localtime_r (&(record->timestamp), &ts);
+  ts_ptr = localtime_r (&(record->timestamp), &ts);
 #else
-  memcpy(&ts, localtime(&(record->timestamp)), sizeof(struct tm));
+  ts_ptr = localtime(&(record->timestamp));
+  if (ts_ptr)
+    memcpy(&ts, ts_ptr, sizeof(struct tm));
 #endif
-  len = strftime(tmp, sizeof(tmp), _("%Y-%m-%dT%H:%M:%S"), &ts);
-
+  if (ts_ptr)
+    len = strftime(tmp, sizeof(tmp), _("%Y-%m-%dT%H:%M:%S"), &ts);
+  else
+    {
+      sl_strlcpy(tmp, _("1970-01-01T00:00:00"), sizeof(tmp));
+      len = strlen(tmp);
+    } 
   record->timestr   = sh_string_new_from_lchar(tmp, len);