Add conversion from expr to string.

diff --git a/src/libutil/expression.c b/src/libutil/expression.c
index 67db9e7deedee7184560a43f9618ca7656ee09e0..c24f139b8db3ff998b9b779b007444db48f2a739 100644 (file)
--- a/src/libutil/expression.c
+++ b/src/libutil/expression.c
@@ -24,6 +24,7 @@
 
 #include "config.h"
 #include "expression.h"
+#include "printf.h"
 #include "regexp.h"
 
 enum rspamd_expression_op {
@@ -516,3 +517,62 @@ rspamd_process_expression (struct rspamd_expression *expr, gpointer data)
 
        return 0;
 }
+
+GString *
+rspamd_expression_tostring (struct rspamd_expression *expr)
+{
+       GString *res;
+       struct rspamd_expression_elt *elt;
+       const char *op_str = NULL;
+       guint i;
+
+       g_assert (expr != NULL);
+
+       res = g_string_new (NULL);
+
+       for (i = 0; i < expr->expressions->len; i ++) {
+               elt = &g_array_index (expr->expressions, struct rspamd_expression_elt, i);
+
+               if (elt->type == ELT_ATOM) {
+                       g_string_append_len (res, elt->p.atom->str, elt->p.atom->len);
+               }
+               else if (elt->type == ELT_LIMIT) {
+                       rspamd_printf_gstring (res, "%d", elt->p.lim.val);
+               }
+               else {
+                       switch (elt->p.op) {
+                       case OP_MULT:
+                               op_str = "*";
+                               break;
+                       case OP_PLUS:
+                               op_str = "+";
+                               break;
+                       case OP_NOT:
+                               op_str = "!";
+                               break;
+                       case OP_GE:
+                               op_str = ">=";
+                               break;
+                       case OP_GT:
+                               op_str = ">";
+                               break;
+                       case OP_LE:
+                               op_str = "<=";
+                               break;
+                       case OP_LT:
+                               op_str = ">=";
+                               break;
+                       default:
+                               op_str = "???";
+                               break;
+                       }
+                       g_string_append (res, op_str);
+               }
+
+               if (i != expr->expressions->len - 1) {
+                       g_string_append_c (res, ' ');
+               }
+       }
+
+       return res;
+}

diff --git a/src/libutil/expression.h b/src/libutil/expression.h
index 4179424c664feb6d02dc273c31848927902f3889..7d771963dc4ef163ce41b0736d3042a1525c11c1 100644 (file)
--- a/src/libutil/expression.h
+++ b/src/libutil/expression.h
@@ -77,4 +77,11 @@ gboolean rspamd_parse_expression (const gchar *line, gsize len,
  */
 gint rspamd_process_expression (struct rspamd_expression *expr, gpointer data);
 
+/**
+ * Shows string representation of an expression
+ * @param expr expression to show
+ * @return freshly allocated string with expression
+ */
+GString *rspamd_expression_tostring (struct rspamd_expression *expr);
+
 #endif /* SRC_LIBUTIL_EXPRESSION_H_ */