![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/data.c b/src/core/data.c
index 1188b4030ba4215304c4f7a47ae25e68a5feb49f..557dfd6a5fb3011d276c22ccb31442edaaf59ff1 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
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;
}
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 */
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_parse_op(const char *op)
+{
+ if (! strcmp(op, "+"))
+ return SDB_DATA_ADD;
+ else if (! strcmp(op, "-"))
+ return SDB_DATA_SUB;
+ else if (! strcmp(op, "*"))
+ return SDB_DATA_MUL;
+ else if (! strcmp(op, "/"))
+ return SDB_DATA_DIV;
+ else if (! strcmp(op, "%"))
+ return SDB_DATA_MOD;
+ else if (! strcmp(op, "||"))
+ return SDB_DATA_CONCAT;
+ return -1;
+} /* sdb_data_parse_op */
+
int
sdb_data_expr_eval(int op, const sdb_data_t *d1, const sdb_data_t *d2,
sdb_data_t *res)
/* 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)
- return 6; /* "NULL" */
+ return 8; /* "<NULL>" */
/* in the worst case, each character needs to be escaped */
return 2 * strlen(datum->data.string) + 2;
case SDB_TYPE_DATETIME:
/* "YYYY-MM-DD HH:MM:SS +zzzz" */
return 27;
case SDB_TYPE_BINARY:
+ if (! datum->data.binary.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 */
@@ -402,11 +492,11 @@ 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)
- data = "NULL";
+ data = "<NULL>";
else {
pos = 0;
for (i = 0; i < strlen(datum->data.string); ++i) {
tmp[pos] = hex[byte & 0xf];
++pos;
}
- tmp[pos] = '\0';
- data = tmp;
+ if (datum->data.binary.datum) {
+ tmp[pos] = '\0';
+ data = tmp;
+ }
+ 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;
}
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, tmp.data.re.raw,
+ REG_EXTENDED | REG_ICASE | REG_NOSUB)) {
+ sdb_log(SDB_LOG_ERR, "core: Failed to compile regular "
+ "expression '%s'", tmp.data.re.raw);
+ free(tmp.data.re.raw);
+ return -1;
+ }
+ if (! data) {
+ tmp.type = SDB_TYPE_REGEX;
+ sdb_data_free_datum(&tmp);
+ }
+ break;
default:
errno = EINVAL;
return -1;