ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fincore: use scols_column_set_json_type() 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-04-18 14:32:39 +02:00
parent 7966cbba53
commit 8945d9dc63
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
misc-utils/fincore.c
View File

@ -368,9 +368,29 @@ int main(int argc, char ** argv)
for (i = 0; i < ncolumns; i++) {
const struct colinfo *col = get_column_info(i);
struct libscols_column *cl;
if (!scols_table_new_column(ctl.tb, col->name, col->whint, col->flags))
cl = scols_table_new_column(ctl.tb, col->name, col->whint, col->flags);
if (!cl)
err(EXIT_FAILURE, _("failed to allocate output column"));
if (ctl.json) {
int id = get_column_id(i);
switch (id) {
case COL_FILE:
scols_column_set_json_type(cl, SCOLS_JSON_STRING);
break;
case COL_SIZE:
case COL_RES:
if (!ctl.bytes)
break;
/* fallthrough */
default:
scols_column_set_json_type(cl, SCOLS_JSON_NUMBER);
break;
}
}
}
for(; optind < argc; optind++) {