]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
column: require column names for JSON
authorKarel Zak <kzak@redhat.com>
Fri, 5 May 2017 10:49:51 +0000 (12:49 +0200)
committerKarel Zak <kzak@redhat.com>
Fri, 5 May 2017 10:49:51 +0000 (12:49 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
text-utils/column.c

index 4d859e013b4b4a925479ca8688d3b048b908ad25..cdfb2339077ca2d8995a70f205f7f6de92acc3c2 100644 (file)
@@ -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)