libsmartcols: (filter) normalize param strings

Let's ignore space at the beginning and end of the string. It's
possible that filling functions in applications use extra space to
align data in columns. We need to ignore it.

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

diff --git a/libsmartcols/src/filter-param.c b/libsmartcols/src/filter-param.c
index 81cbb2a60a26378452fc0a63aa6a7c71da0939d2..cc2d7af4a49dce463793e6a5eb287292f3a63a9f 100644 (file)
--- a/libsmartcols/src/filter-param.c
+++ b/libsmartcols/src/filter-param.c
@@ -66,6 +66,10 @@ static int param_set_data(struct filter_param *n, int type, const void *data)
                        n->val.str = strdup((char *) data);
                if (data && !n->val.str)
                        return -ENOMEM;
+               if (data) {
+                       rtrim_whitespace((unsigned char *) n->val.str);
+                       ltrim_whitespace((unsigned char *) n->val.str);
+               }
                break;
        case SCOLS_DATA_U64:
                n->val.num = data ? *((unsigned long long *) data) : 0;

diff --git a/libsmartcols/src/filter.c b/libsmartcols/src/filter.c
index 1fbbb573898c2422441d9f502ad0674d7573680b..c68f721cbb100b9b203e195b801263060cd17a64 100644 (file)
--- a/libsmartcols/src/filter.c
+++ b/libsmartcols/src/filter.c
@@ -153,6 +153,8 @@ int scols_filter_parse_string(struct libscols_filter *fltr, const char *str)
        fclose(fltr->src);
        fltr->src = NULL;
 
+       ON_DBG(FLTR, scols_dump_filter(fltr, stderr));
+
        return rc;
 }