data: Added support for a "regex" data-type.

[sysdb.git] / src / core / data.c

diff --git a/src/core/data.c b/src/core/data.c
index a57c8c6affc739a2e95bad3c0bd9dc08442c5088..2a8c439e08c7da72dca03ce9b28e0c59413e36b2 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
@@ -241,16 +241,36 @@ sdb_data_copy(sdb_data_t *dst, const sdb_data_t *src)
        tmp = *src;
        switch (src->type) {
                case SDB_TYPE_STRING:
-                       tmp.data.string = strdup(src->data.string);
-                       if (! tmp.data.string)
-                               return -1;
+                       if (src->data.string) {
+                               tmp.data.string = strdup(src->data.string);
+                               if (! tmp.data.string)
+                                       return -1;
+                       }
                        break;
                case SDB_TYPE_BINARY:
-                       tmp.data.binary.datum = malloc(src->data.binary.length);
-                       if (! tmp.data.binary.datum)
-                               return -1;
-                       memcpy(tmp.data.binary.datum, src->data.binary.datum,
-                                       src->data.binary.length);
+                       if (src->data.binary.datum) {
+                               tmp.data.binary.datum = malloc(src->data.binary.length);
+                               if (! tmp.data.binary.datum)
+                                       return -1;
+                               memcpy(tmp.data.binary.datum, src->data.binary.datum,
+                                               src->data.binary.length);
+                       }
+                       break;
+               case SDB_TYPE_REGEX:
+                       if (src->data.re.raw) {
+                               tmp.data.re.raw = strdup(src->data.re.raw);
+                               if (! tmp.data.re.raw)
+                                       return -1;
+                               /* we need to recompile because the regex might point to
+                                * dynamically allocated memory */
+                               if (regcomp(&tmp.data.re.regex, tmp.data.re.raw,
+                                                       REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
+                                       free(tmp.data.re.raw);
+                                       return -1;
+                               }
+                       }
+                       else
+                               memset(&tmp.data.re.regex, 0, sizeof(tmp.data.re.regex));
                        break;
        }
 
@@ -277,6 +297,14 @@ sdb_data_free_datum(sdb_data_t *datum)
                        datum->data.binary.datum = NULL;
                        datum->data.binary.length = 0;
                        break;
+               case SDB_TYPE_REGEX:
+                       if (datum->data.re.raw) {
+                               free(datum->data.re.raw);
+                               regfree(&datum->data.re.regex);
+                       }
+                       datum->data.re.raw = NULL;
+                       memset(&datum->data.re.regex, 0, sizeof(datum->data.re.regex));
+                       break;
        }
 } /* sdb_data_free_datum */
 
@@ -328,12 +356,49 @@ sdb_data_cmp(const sdb_data_t *d1, const sdb_data_t *d2)
 
                        return diff;
                }
-               default:
-                       return -1;
+               case SDB_TYPE_REGEX:
+                       CMP_NULL(d1->data.re.raw, d2->data.re.raw);
+                       return strcmp(d1->data.re.raw, d2->data.re.raw);
        }
-#undef CMP_NULL
+       return -1;
 } /* sdb_data_cmp */
 
+int
+sdb_data_strcmp(const sdb_data_t *d1, const sdb_data_t *d2)
+{
+       char d1_str[sdb_data_strlen(d1) + 1];
+       char d2_str[sdb_data_strlen(d2) + 1];
+
+       if (sdb_data_isnull(d1))
+               d1 = NULL;
+       if (sdb_data_isnull(d2))
+               d2 = NULL;
+
+       CMP_NULL(d1, d2);
+
+       if (sdb_data_format(d1, d1_str, sizeof(d1_str), SDB_UNQUOTED) < 0)
+               return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
+       if (sdb_data_format(d2, d2_str, sizeof(d2_str), SDB_UNQUOTED) < 0)
+               return SDB_CMP(sizeof(d1_str), sizeof(d2_str));
+
+       return strcasecmp(d1_str, d2_str);
+#undef CMP_NULL
+} /* sdb_data_strcmp */
+
+_Bool
+sdb_data_isnull(const sdb_data_t *datum)
+{
+       if (! datum)
+               return 1;
+       if ((datum->type == SDB_TYPE_STRING) && (! datum->data.string))
+               return 1;
+       if ((datum->type == SDB_TYPE_BINARY) && (! datum->data.binary.datum))
+               return 1;
+       if ((datum->type == SDB_TYPE_REGEX) && (! datum->data.re.raw))
+               return 1;
+       return 0;
+} /* sdb_data_isnull */
+
 int
 sdb_data_expr_eval(int op, const sdb_data_t *d1, const sdb_data_t *d2,
                sdb_data_t *res)
@@ -368,7 +433,7 @@ sdb_data_strlen(const sdb_data_t *datum)
                        /* log(64) */
                        return 20;
                case SDB_TYPE_DECIMAL:
-                       /* XXX: -0xN.NNNNNNp+NNN */
+                       /* XXX: -d.dddddde+dd or -ddddd.dddddd */
                        return 42;
                case SDB_TYPE_STRING:
                        if (! datum->data.string)
@@ -383,6 +448,11 @@ sdb_data_strlen(const sdb_data_t *datum)
                                return 8; /* "<NULL>" */
                        /* "\xNN" */
                        return 4 * datum->data.binary.length + 2;
+               case SDB_TYPE_REGEX:
+                       if (! datum->data.re.raw)
+                               return 8; /* "<NULL>" */
+                       /* "/.../" */
+                       return strlen(datum->data.re.raw) + 4;
        }
        return 0;
 } /* sdb_data_strlen */
@@ -404,7 +474,7 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
                        ret = snprintf(buf, buflen, "%"PRIi64, datum->data.integer);
                        break;
                case SDB_TYPE_DECIMAL:
-                       ret = snprintf(buf, buflen, "%a", datum->data.decimal);
+                       ret = snprintf(buf, buflen, "%g", datum->data.decimal);
                        break;
                case SDB_TYPE_STRING:
                        if (! datum->data.string)
@@ -457,6 +527,14 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
                        else
                                data = "<NULL>";
                        break;
+               case SDB_TYPE_REGEX:
+                       if (! datum->data.re.raw)
+                               data = "<NULL>";
+                       else {
+                               snprintf(tmp, sizeof(tmp), "/%s/", datum->data.re.raw);
+                               data = tmp;
+                       }
+                       break;
        }
 
        if (data) {
@@ -500,6 +578,22 @@ sdb_data_parse(char *str, int type, sdb_data_t *data)
                        tmp.data.binary.length = strlen(str);
                        tmp.data.binary.datum = (unsigned char *)str;
                        break;
+               case SDB_TYPE_REGEX:
+                       tmp.data.re.raw = strdup(str);
+                       if (! tmp.data.re.raw)
+                               return -1;
+                       if (regcomp(&tmp.data.re.regex, str,
+                                               REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
+                               free(tmp.data.re.raw);
+                               sdb_log(SDB_LOG_ERR, "core: Failed to compile regular "
+                                               "expression '%s'", str);
+                               return -1;
+                       }
+                       if (! data) {
+                               tmp.type = SDB_TYPE_REGEX;
+                               sdb_data_free_datum(&tmp);
+                       }
+                       break;
                default:
                        errno = EINVAL;
                        return -1;