From: Karel Zak <kzak@redhat.com>
Date: Fri, 16 Sep 2016 11:22:47 +0000 (+0200)
Subject: libsmartcols: improve JSON
X-Git-Tag: v2.29-rc1~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65f3ebc334f71846feb2536df570102ad26febff;p=thirdparty%2Futil-linux.git

libsmartcols: improve JSON

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index 6a0f8303d9..c0cf24636f 100644
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -725,7 +725,7 @@ int scols_table_set_symbols(struct libscols_table *tb,
  *
  * Enable/disable line separator printing. This is useful if you want to
  * re-printing the same line more than once (e.g. progress bar). Don't use it
- * if you're not sure. This option may be ignored for JSON output.
+ * if you're not sure.
  *
  * Returns: 0 on success, negative number in case of an error.
  */
diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c
index e8a4aa3615..41b56d1d64 100644
--- a/libsmartcols/src/table_print.c
+++ b/libsmartcols/src/table_print.c
@@ -684,7 +684,8 @@ static void fput_line_close(struct libscols_table *tb, int last, int last_in_tab
 		if (tb->indent_last_sep)
 			fput_indent(tb);
 		fputs(last ? "}" : "},", tb->out);
-		fputs(linesep(tb), tb->out);
+		if (!tb->no_linesep)
+			fputs(linesep(tb), tb->out);
 
 	} else if (tb->no_linesep == 0 && last_in_table == 0)
 		fputs(linesep(tb), tb->out);