libsmartcols: reflect changinging SCOLS_FL_TREE after adding to table

When scols_column_set_flags() is called we will compare before & after
status of SCOLS_FL_TREE flag and appropriately handle tb->ntreecols.

Reference: https://github.com/karelzak/util-linux/issues/254
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c
index 269ceea0c8529d7bf2bb4d175d80e8f0f8bc58b0..b31b39063fed0221edc7c1d50adad70a31f96f95 100644 (file)
--- a/libsmartcols/src/column.c
+++ b/libsmartcols/src/column.c
@@ -157,6 +157,13 @@ int scols_column_set_flags(struct libscols_column *cl, int flags)
        if (!cl)
                return -EINVAL;
 
+       if (cl->table) {
+               if (!(cl->flags & SCOLS_FL_TREE) && (flags & SCOLS_FL_TREE))
+                       cl->table->ntreecols++;
+               else if ((cl->flags & SCOLS_FL_TREE) && !(flags & SCOLS_FL_TREE))
+                       cl->table->ntreecols--;
+       }
+
        cl->flags = flags;
        return 0;
 }

diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h
index 163417707e54d59a2dcf33c1c4a3512f3e6fff90..9f63c3ad1eafdbd96c096d6ba6a3433db854483a 100644 (file)
--- a/libsmartcols/src/smartcolsP.h
+++ b/libsmartcols/src/smartcolsP.h
@@ -89,6 +89,8 @@ struct libscols_column {
 
        struct libscols_cell    header;
        struct list_head        cl_columns;
+
+       struct libscols_table   *table;
 };
 
 /*

diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c
index cb4cfae0d393bb1193b71f8990cee64519199a84..3360d525bc88c0683420143350ddcb631be8dfa6 100644 (file)
--- a/libsmartcols/src/table.c
+++ b/libsmartcols/src/table.c
@@ -141,6 +141,7 @@ int scols_table_add_column(struct libscols_table *tb, struct libscols_column *cl
        DBG(TAB, ul_debugobj(tb, "add column %p", cl));
        list_add_tail(&cl->cl_columns, &tb->tb_columns);
        cl->seqnum = tb->ncols++;
+       cl->table = tb;
        scols_ref_column(cl);
 
        /* TODO:
@@ -173,6 +174,7 @@ int scols_table_remove_column(struct libscols_table *tb,
        DBG(TAB, ul_debugobj(tb, "remove column %p", cl));
        list_del_init(&cl->cl_columns);
        tb->ncols--;
+       cl->table = NULL;
        scols_unref_column(cl);
        return 0;
 }