From: Karel Zak <kzak@redhat.com>
Date: Fri, 5 May 2017 10:49:51 +0000 (+0200)
Subject: column: require column names for JSON
X-Git-Tag: v2.30-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3fdf2ae9836d48b6176b4a9735d38796cbda88;p=thirdparty%2Futil-linux.git

column: require column names for JSON

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

diff --git a/text-utils/column.c b/text-utils/column.c
index 4d859e013b..cdfb233907 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -393,8 +393,14 @@ static int add_line_to_table(struct column_control *ctl, wchar_t *wcs)
 	while ((wcdata = local_wcstok(wcs, ctl->input_separator, ctl->greedy, &sv))) {
 		char *data;
 
-		if (scols_table_get_ncols(ctl->tab) < n + 1)
+		if (scols_table_get_ncols(ctl->tab) < n + 1) {
+			if (scols_table_is_json(ctl->tab))
+				errx(EXIT_FAILURE, _("line %zu: for JSON the name of the "
+					"column %zu is required"),
+					scols_table_get_nlines(ctl->tab) + 1,
+					n + 1);
 			scols_table_new_column(ctl->tab, NULL, 0, 0);
+		}
 		if (!ln) {
 			ln = scols_table_new_line(ctl->tab, NULL);
 			if (!ln)