X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fdata.c;h=d34a4dd711250041cd26d463575535bd70522f4a;hb=93b9a7b401a9ec48239c0de6b55aa2377849c2c8;hp=503db29a36c500ce34a093f465c7ca252348a8c5;hpb=49b5a4d2e8e4fb1e4f67c2a368d8d2e3e76b765f;p=sysdb.git

diff --git a/src/core/data.c b/src/core/data.c
index 503db29..d34a4dd 100644
--- a/src/core/data.c
+++ b/src/core/data.c
@@ -166,6 +166,34 @@ free_array_values(sdb_data_t *datum)
 			v[i] = NULL;
 		}
 	}
+	else if (type == SDB_TYPE_BINARY) {
+		struct {
+			size_t length;
+			unsigned char *datum;
+		} *v = datum->data.array.values;
+		size_t i;
+
+		for (i = 0; i < datum->data.array.length; ++i) {
+			if (v[i].datum)
+				free(v[i].datum);
+			v[i].datum = NULL;
+		}
+	}
+	else if (type == SDB_TYPE_REGEX) {
+		struct {
+			char *raw;
+			regex_t regex;
+		} *v = datum->data.array.values;
+		size_t i;
+
+		for (i = 0; i < datum->data.array.length; ++i) {
+			if (v[i].raw) {
+				free(v[i].raw);
+				regfree(&v[i].regex);
+			}
+			v[i].raw = NULL;
+		}
+	}
 } /* free_array_values */
 
 /* compare two arrays element-by-element returning how the first non-equal
@@ -206,9 +234,61 @@ array_cmp(const sdb_data_t *a1, const sdb_data_t *a2)
 				return diff;
 		}
 	}
+	else if (type == SDB_TYPE_DATETIME) {
+		sdb_time_t *v1 = a1->data.array.values;
+		sdb_time_t *v2 = a2->data.array.values;
+
+		for (i = 0; i < len; ++i)
+			if (v1[i] != v2[i])
+				return SDB_CMP(v1[i], v2[i]);
+	}
+	else if (type == SDB_TYPE_BINARY) {
+		struct {
+			size_t length;
+			unsigned char *datum;
+		} *v1 = a1->data.array.values;
+		struct {
+			size_t length;
+			unsigned char *datum;
+		} *v2 = a2->data.array.values;
+
+		for (i = 0; i < len; ++i) {
+			int diff;
+
+			/* on a common prefix, the shorter datum sorts less */
+			if (v1[i].length < v2[i].length) {
+				diff = memcmp(v1[i].datum, v2[i].datum, v1[i].length);
+				diff = diff ? diff : -1;
+			}
+			else if (v1[i].length > v2[i].length) {
+				diff = memcmp(v1[i].datum, v2[i].datum, v2[i].length);
+				diff = diff ? diff : 1;
+			}
+			else
+				diff = memcmp(v1[i].datum, v2[i].datum, v1[i].length);
+
+			if (diff)
+				return diff;
+		}
+	}
+	else if (type == SDB_TYPE_REGEX) {
+		struct {
+			char *raw;
+			regex_t regex;
+		} *v1 = a1->data.array.values;
+		struct {
+			char *raw;
+			regex_t regex;
+		} *v2 = a2->data.array.values;
+
+		for (i = 0; i < len; ++i) {
+			int diff = strcasecmp(v1[i].raw, v2[i].raw);
+			if (diff)
+				return diff;
+		}
+	}
 	else {
-		/* TODO */
-		errno = ENOTSUP;
+		errno = EINVAL;
 		/* but fall through to ensure stable sorting: */
 	}
 	return SDB_CMP(a1->data.array.length, a2->data.array.length);
@@ -962,12 +1042,17 @@ sdb_data_format(const sdb_data_t *datum, char *buf, size_t buflen, int quoted)
 } /* sdb_data_format */
 
 int
-sdb_data_parse(char *str, int type, sdb_data_t *data)
+sdb_data_parse(const char *str, int type, sdb_data_t *data)
 {
 	sdb_data_t tmp;
 
 	char *endptr = NULL;
 
+	if (! str) {
+		errno = EINVAL;
+		return -1;
+	}
+
 	errno = 0;
 	if (type == SDB_TYPE_INTEGER) {
 		tmp.data.integer = strtoll(str, &endptr, 0);
@@ -976,16 +1061,20 @@ sdb_data_parse(char *str, int type, sdb_data_t *data)
 		tmp.data.decimal = strtod(str, &endptr);
 	}
 	else if (type == SDB_TYPE_STRING) {
-		tmp.data.string = str;
+		tmp.data.string = strdup(str);
+		if (! tmp.data.string)
+			return -1;
 	}
 	else if (type == SDB_TYPE_DATETIME) {
 		double datetime = strtod(str, &endptr);
 		tmp.data.datetime = DOUBLE_TO_SDB_TIME(datetime);
 	}
 	else if (type == SDB_TYPE_BINARY) {
-		/* we don't support any binary information containing 0-bytes */
+		/* we don't support any binary information containing 0-bytes here */
+		tmp.data.binary.datum = (unsigned char *)strdup(str);
+		if (! tmp.data.binary.datum)
+			return -1;
 		tmp.data.binary.length = strlen(str);
-		tmp.data.binary.datum = (unsigned char *)str;
 	}
 	else if (type == SDB_TYPE_REGEX) {
 		tmp.data.re.raw = strdup(str);