X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fdata.c;h=4e0fd779580f9dd734bf1211dc2769ca326a179f;hp=4c89b43dd179363aa7644a8a35dda5206739d10d;hb=39a45905e0b237e458b1826ff9b4fad1c4a59550;hpb=d4808fb260537e65936d9dd25e22cdccd5f7fb6d

diff --git a/src/core/data.c b/src/core/data.c
index 4c89b43..4e0fd77 100644
--- a/src/core/data.c
+++ b/src/core/data.c
@@ -25,10 +25,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "core/data.h"
 
 #include <inttypes.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -114,27 +119,28 @@ sdb_data_strlen(sdb_data_t *datum)
 } /* sdb_data_strlen */
 
 int
-sdb_data_format(sdb_data_t *datum, sdb_strbuf_t *buf)
+sdb_data_format(sdb_data_t *datum, char *buf, size_t buflen, int quoted)
 {
+	char tmp[sdb_data_strlen(datum) + 1];
+	char *data = NULL;
+	int ret = -1;
+
+	size_t i, pos;
+
 	if ((! datum) || (! buf))
 		return -1;
 
 	switch (datum->type) {
 		case SDB_TYPE_INTEGER:
-			sdb_strbuf_append(buf, "%"PRIi64, datum->data.integer);
+			ret = snprintf(buf, buflen, "%"PRIi64, datum->data.integer);
 			break;
 		case SDB_TYPE_DECIMAL:
-			sdb_strbuf_append(buf, "%a", datum->data.decimal);
+			ret = snprintf(buf, buflen, "%a", datum->data.decimal);
 			break;
 		case SDB_TYPE_STRING:
-			if (! datum->data.string) {
-				sdb_strbuf_append(buf, "\"NULL\"");
-				return 0;
-			}
-			{
-				char tmp[2 * strlen(datum->data.string) + 1];
-				size_t i, pos;
-
+			if (! datum->data.string)
+				data = "NULL";
+			else {
 				pos = 0;
 				for (i = 0; i < strlen(datum->data.string); ++i) {
 					char byte = datum->data.string[i];
@@ -147,49 +153,49 @@ sdb_data_format(sdb_data_t *datum, sdb_strbuf_t *buf)
 					++pos;
 				}
 				tmp[pos] = '\0';
-				sdb_strbuf_append(buf, "\"%s\"", tmp);
+				data = tmp;
 			}
 			break;
 		case SDB_TYPE_DATETIME:
-			{
-				char tmp[64];
-				if (! sdb_strftime(tmp, sizeof(tmp), "%F %T %z",
-							datum->data.datetime))
-					return -1;
-				tmp[sizeof(tmp) - 1] = '\0';
-				sdb_strbuf_append(buf, "\"%s\"", tmp);
-			}
+			if (! sdb_strftime(tmp, sizeof(tmp), "%F %T %z",
+						datum->data.datetime))
+				return -1;
+			tmp[sizeof(tmp) - 1] = '\0';
+			data = tmp;
 			break;
 		case SDB_TYPE_BINARY:
-			{
-				char tmp[4 * datum->data.binary.length + 1];
-				size_t i, pos;
-
-				pos = 0;
-				for (i = 0; i < datum->data.binary.length; ++i) {
-					int byte = (int)datum->data.binary.datum[i];
-					char hex[] = {'0', '1', '2', '3', '4', '5', '6', '7',
-						'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-					tmp[pos] = '\\';
-					tmp[pos + 1] = 'x';
-					pos += 2;
-
-					if (byte > 0xf) {
-						tmp[pos] = hex[byte >> 4];
-						++pos;
-					}
-					tmp[pos] = hex[byte & 0xf];
+			pos = 0;
+			for (i = 0; i < datum->data.binary.length; ++i) {
+				int byte = (int)datum->data.binary.datum[i];
+				char hex[] = {'0', '1', '2', '3', '4', '5', '6', '7',
+					'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+				tmp[pos] = '\\';
+				tmp[pos + 1] = 'x';
+				pos += 2;
+
+				if (byte > 0xf) {
+					tmp[pos] = hex[byte >> 4];
 					++pos;
 				}
-				tmp[pos] = '\0';
-				sdb_strbuf_append(buf, "\"%s\"", tmp);
+				tmp[pos] = hex[byte & 0xf];
+				++pos;
 			}
+			tmp[pos] = '\0';
+			data = tmp;
 			break;
-		default:
-			return -1;
 	}
-	return 0;
+
+	if (data) {
+		if (quoted == SDB_UNQUOTED)
+			ret = snprintf(buf, buflen, "%s", data);
+		else if (quoted == SDB_SINGLE_QUOTED)
+			ret = snprintf(buf, buflen, "'%s'", data);
+		else
+			ret = snprintf(buf, buflen, "\"%s\"", data);
+	}
+	buf[buflen - 1] = '\0';
+	return ret;
 } /* sdb_data_format */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */