lib: var_expand*() - Ignore modifiers for unknown variables

So for example %M{asdf} will return UNSUPPORTED_VARIABLE_asdf instead of MD5
hash of it, which might not be so obvious that it's not working correctly.

diff --git a/src/lib/test-var-expand.c b/src/lib/test-var-expand.c
index 656b647407c1fa78f11b6991564bd83fbda16836..bae4277f5dd4600c5b024b88e3b027797b46e60e 100644 (file)
--- a/src/lib/test-var-expand.c
+++ b/src/lib/test-var-expand.c
@@ -58,8 +58,9 @@ static void test_var_expand_builtin(void)
                { "%50Nw", "e", 1 },
 
                { "%{nonexistent}", "UNSUPPORTED_VARIABLE_nonexistent", 0 },
-               { "%{nonexistent:default}", "UNSUPPORTED_VARIABLE_nonexistent", 0 },
+               { "%1.2M{nonexistent:default}", "UNSUPPORTED_VARIABLE_nonexistent", 0 },
                { "%x", "UNSUPPORTED_VARIABLE_x", 0 },
+               { "%5Mm", "UNSUPPORTED_VARIABLE_m", 0 },
        };
        static const struct var_expand_table table[] = {
                { 'v', "value", NULL },

diff --git a/src/lib/var-expand.c b/src/lib/var-expand.c
index 465dca6e138a1ee9344a1774490cabc6ab3ad25f..4d785f068001d9db61f3a7e7a58e36e8c061e3f7 100644 (file)
--- a/src/lib/var-expand.c
+++ b/src/lib/var-expand.c
@@ -589,7 +589,9 @@ int var_expand_with_funcs(string_t *dest, const char *str,
                        if (final_ret > ret)
                                final_ret = ret;
 
-                       if (var != NULL) {
+                       if (ret <= 0)
+                               str_append(dest, var);
+                       else {
                                for (i = 0; i < modifier_count; i++)
                                        var = modifier[i](var, &ctx);