diff options
author | Sébastien Helleu <flashcode@flashtux.org> | 2020-05-21 09:36:35 +0200 |
---|---|---|
committer | Sébastien Helleu <flashcode@flashtux.org> | 2020-05-21 09:36:35 +0200 |
commit | 66d4590dabb51977df6a460d71dc80c740870b6c (patch) | |
tree | c49243b3fb8e5ac450efcea2e185202b50bebdd9 /src/core | |
parent | 1994d5641dda09d3825b4cc6baf3b57a20b2ffc2 (diff) | |
download | weechat-66d4590dabb51977df6a460d71dc80c740870b6c.zip |
core: add base 16/32/64 encoding/decoding in evaluation of expressions
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/wee-command.c | 18 | ||||
-rw-r--r-- | src/core/wee-eval.c | 138 |
2 files changed, 135 insertions, 21 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 962d69f97..acde2d3cc 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -7435,15 +7435,17 @@ command_init () " 9. a modifier (format: \"modifier:name,data,string\")\n" " 10. an info (format: \"info:name,arguments\", arguments are " "optional)\n" - " 11. current date/time (format: \"date\" or \"date:format\")\n" - " 12. an environment variable (format: \"env:XXX\")\n" - " 13. a ternary operator (format: " + " 11. a base 16/32/64 encoded/decoded string (format: " + "\"base_encode:base,xxx\" or \"base_decode:base,xxx\")\n" + " 12. current date/time (format: \"date\" or \"date:format\")\n" + " 13. an environment variable (format: \"env:XXX\")\n" + " 14. a ternary operator (format: " "\"if:condition?value_if_true:value_if_false\")\n" - " 14. result of an expression with parentheses and operators " + " 15. result of an expression with parentheses and operators " "+ - * / // % ** (format: \"calc:xxx\")\n" - " 15. an option (format: \"file.section.option\")\n" - " 16. a local variable in buffer\n" - " 17. a hdata name/variable (the value is automatically converted " + " 16. an option (format: \"file.section.option\")\n" + " 17. a local variable in buffer\n" + " 18. a hdata name/variable (the value is automatically converted " "to string), by default \"window\" and \"buffer\" point to current " "window/buffer.\n" "Format for hdata can be one of following:\n" @@ -7481,6 +7483,8 @@ command_init () " /eval -n ${repeat:5,-} ==> -----\n" " /eval -n ${length:test} ==> 4\n" " /eval -n ${calc:(5+2)*3} ==> 21\n" + " /eval -n ${base_encode:64,test} ==> dGVzdA==\n" + " /eval -n ${base_decode:64,dGVzdA==} ==> test\n" "\n" "Examples (conditions):\n" " /eval -n -c ${window.buffer.number} > 2 ==> 0\n" diff --git a/src/core/wee-eval.c b/src/core/wee-eval.c index c80322031..4d64c641f 100644 --- a/src/core/wee-eval.c +++ b/src/core/wee-eval.c @@ -423,6 +423,7 @@ eval_string_info (const char *text) char *value, *info_name; value = NULL; + ptr_arguments = strchr (text, ','); if (ptr_arguments) { @@ -430,7 +431,10 @@ eval_string_info (const char *text) ptr_arguments++; } else + { info_name = strdup (text); + } + if (info_name) { value = hook_info_get (NULL, info_name, ptr_arguments); @@ -441,6 +445,104 @@ eval_string_info (const char *text) } /* + * Encodes a string in base 16, 32, or 64. + * + * Note: result must be freed after use. + */ + +char * +eval_string_base_encode (const char *text) +{ + const char *ptr_string; + char *value, *base, *error, *result; + long number; + int length; + + base = NULL; + result = NULL; + + ptr_string = strchr (text, ','); + if (!ptr_string) + goto end; + + base = string_strndup (text, ptr_string - text); + if (!base) + goto end; + + number = strtol (base, &error, 10); + if (!error || error[0]) + goto end; + + ptr_string++; + length = strlen (ptr_string); + result = malloc ((length * 4) + 1); + if (!result) + goto end; + + if (string_base_encode (number, ptr_string, length, result) < 0) + { + free (result); + result = NULL; + } + +end: + value = strdup ((result) ? result : ""); + if (base) + free (base); + if (result) + free (result); + return value; +} + +/* + * Decodes a string encoded in base 16, 32, or 64. + * + * Note: result must be freed after use. + */ + +char * +eval_string_base_decode (const char *text) +{ + const char *ptr_string; + char *value, *base, *error, *result; + long number; + + base = NULL; + result = NULL; + + ptr_string = strchr (text, ','); + if (!ptr_string) + goto end; + + base = string_strndup (text, ptr_string - text); + if (!base) + goto end; + + number = strtol (base, &error, 10); + if (!error || error[0]) + goto end; + + ptr_string++; + result = malloc (strlen (ptr_string) + 1); + if (!result) + goto end; + + if (string_base_decode (number, ptr_string, result) < 0) + { + free (result); + result = NULL; + } + +end: + value = strdup ((result) ? result : ""); + if (base) + free (base); + if (result) + free (result); + return value; +} + +/* * Returns a date. * * Note: result must be freed after use. @@ -805,13 +907,15 @@ end: * 10. a color (format: color:xxx) * 11. a modifier (format: modifier:name,data,xxx) * 12. an info (format: info:name,arguments) - * 13. current date/time (format: date or date:xxx) - * 14. an environment variable (format: env:XXX) - * 15. a ternary operator (format: if:condition?value_if_true:value_if_false) - * 16. calculate result of an expression (format: calc:xxx) - * 17. an option (format: file.section.option) - * 18. a buffer local variable - * 19. a hdata variable (format: hdata.var1.var2 or hdata[list].var1.var2 + * 13. a base 16/32/64 encoded/decoded string (format: base_encode:base,xxx + * or base_decode:base,xxx) + * 14. current date/time (format: date or date:xxx) + * 15. an environment variable (format: env:XXX) + * 16. a ternary operator (format: if:condition?value_if_true:value_if_false) + * 17. calculate result of an expression (format: calc:xxx) + * 18. an option (format: file.section.option) + * 19. a buffer local variable + * 20. a hdata variable (format: hdata.var1.var2 or hdata[list].var1.var2 * or hdata[ptr].var1.var2) * * See /help in WeeChat for examples. @@ -931,11 +1035,17 @@ eval_replace_vars_cb (void *data, const char *text) if (strncmp (text, "info:", 5) == 0) return eval_string_info (text + 5); - /* 13. current date/time */ + /* 13. base_encode/base_decode */ + if (strncmp (text, "base_encode:", 12) == 0) + return eval_string_base_encode (text + 12); + if (strncmp (text, "base_decode:", 12) == 0) + return eval_string_base_decode (text + 12); + + /* 14. current date/time */ if ((strncmp (text, "date", 4) == 0) && (!text[4] || (text[4] == ':'))) return eval_string_date (text + 4); - /* 14. environment variable */ + /* 15. environment variable */ if (strncmp (text, "env:", 4) == 0) { ptr_value = getenv (text + 4); @@ -943,18 +1053,18 @@ eval_replace_vars_cb (void *data, const char *text) return strdup (ptr_value); } - /* 15: ternary operator: if:condition?value_if_true:value_if_false */ + /* 16: ternary operator: if:condition?value_if_true:value_if_false */ if (strncmp (text, "if:", 3) == 0) return eval_string_if (text + 3, eval_context); /* - * 16. calculate the result of an expression + * 17. calculate the result of an expression * (with number, operators and parentheses) */ if (strncmp (text, "calc:", 5) == 0) return calc_expression (text + 5); - /* 17. option: if found, return this value */ + /* 18. option: if found, return this value */ if (strncmp (text, "sec.data.", 9) == 0) { ptr_value = hashtable_get (secure_hashtable_data, text + 9); @@ -984,7 +1094,7 @@ eval_replace_vars_cb (void *data, const char *text) } } - /* 18. local variable in buffer */ + /* 19. local variable in buffer */ ptr_buffer = hashtable_get (eval_context->pointers, "buffer"); if (ptr_buffer) { @@ -993,7 +1103,7 @@ eval_replace_vars_cb (void *data, const char *text) return strdup (ptr_value); } - /* 19. hdata */ + /* 20. hdata */ return eval_string_hdata (text, eval_context); } |