From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 29 Jun 2016 13:17:19 +0000 (+0200)
Subject: Fix #766 about Job logs displayed with unneeded linefeed
X-Git-Tag: Release-7.4.2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=043251af23bd2166a1dccf6a9e5839a2dbdc0b65;p=bacula%2Fbacula

Fix #766 about Job logs displayed with unneeded linefeed
---

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index e241d09efd..b20911c878 100644
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -686,7 +686,8 @@ list_result(JCR *jcr, BDB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type ty
          } else if (mdb->sql_field_is_numeric(field->type) && !jcr->gui && is_an_integer(row[i])) { 
             bsnprintf(buf, sizeof(buf), " %*s |", max_len, 
                       add_commas(row[i], ewc)); 
-         } else { 
+         } else {
+            strip_trailing_junk(row[i]);
             bsnprintf(buf, sizeof(buf), " %-*s |", max_len, row[i]); 
          } 
          send(ctx, buf); 
@@ -711,7 +712,8 @@ vertical_list:
          } else if (mdb->sql_field_is_numeric(field->type) && !jcr->gui && is_an_integer(row[i])) { 
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, 
                 add_commas(row[i], ewc)); 
-         } else { 
+         } else {
+            strip_trailing_junk(row[i]);
             bsnprintf(buf, sizeof(buf), " %*s: %s\n", max_len, field->name, row[i]); 
          } 
          send(ctx, buf);