data: Format binary bytes as \xXX rather than \XX.

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

diff --git a/src/core/data.c b/src/core/data.c
index c71e3630e4f76dcf8d61fbb82370f818590b8b21..735639dcc450f2761dbf0179a70a27d7de784c81 100644 (file)
--- a/src/core/data.c
+++ b/src/core/data.c
@@ -27,6 +27,8 @@
 
 #include "core/data.h"
 
+#include <inttypes.h>
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -83,5 +85,64 @@ sdb_data_free_datum(sdb_data_t *datum)
        }
 } /* sdb_data_free_datum */
 
+int
+sdb_data_format(sdb_data_t *datum, sdb_strbuf_t *buf)
+{
+       if ((! datum) || (! buf))
+               return -1;
+
+       switch (datum->type) {
+               case SDB_TYPE_INTEGER:
+                       sdb_strbuf_append(buf, "%"PRIi64, datum->data.integer);
+                       break;
+               case SDB_TYPE_DECIMAL:
+                       sdb_strbuf_append(buf, "%a", datum->data.decimal);
+                       break;
+               case SDB_TYPE_STRING:
+                       /* TODO: escape special characters */
+                       sdb_strbuf_append(buf, "\"%s\"", datum->data.string);
+                       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);
+                       }
+                       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;
+                               }
+                               tmp[pos] = '\0';
+                               sdb_strbuf_append(buf, "\"%s\"", tmp);
+                       }
+                       break;
+               default:
+                       return -1;
+       }
+       return 0;
+} /* sdb_data_format */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */