Fix extra space when no TZ printed

diff --git a/sadf_misc.c b/sadf_misc.c
index cda8e99870f08f418c9fbfae0feb346cc2457d51..e9a3f236c4ffa454a6d39c0ee337016e22450bf6 100644 (file)
--- a/sadf_misc.c
+++ b/sadf_misc.c
@@ -832,11 +832,18 @@ char *print_dbppc_timestamp(int fmt, struct file_header *file_hdr, char *cur_dat
        else {
                strcpy(temp2, temp1);
        }
-       snprintf(pre, sizeof(pre), "%s%s %s", temp2, cur_time,
-                strlen(cur_date) ? (PRINT_LOCAL_TIME(flags) ? my_tz
-                                                            : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname
-                                                                                      : "UTC"))
-                                 : "");
+
+       if (strlen(cur_date) && (!PRINT_TRUE_TIME(flags) || (PRINT_TRUE_TIME(flags) && strlen(file_hdr->sa_tzname)))) {
+               snprintf(pre, sizeof(pre), "%s%s %s", temp2, cur_time,
+                PRINT_LOCAL_TIME(flags) ? my_tz 
+                       : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname 
+                               : "UTC"));
+       } else {
+               snprintf(pre, sizeof(pre), "%s%s", temp2, cur_time);
+       }
+
+
+       
        pre[sizeof(pre) - 1] = '\0';
 
        if (DISPLAY_HORIZONTALLY(flags)) {