Add hipack-cat tool

.gitignore

@@ -3,5 +3,6 @@
 .*.sw[op]
 *.gcda
 *.gcno
+tools/hipack-cat
 tools/hipack-parse
 tools/hipack-roundtrip

Makefile

@@ -13,6 +13,7 @@ hipack: ${hipack}
 hipack-clean:
 	${RM} ${hipack} ${hipack_OBJS}
 	${RM} ${hipack_PATH}/tools/*.o \
+		${hipack_PATH}/tools/hipack-cat \
 		${hipack_PATH}/tools/hipack-parse \
 		${hipack_PATH}/tools/hipack-roundtrip
 
@@ -21,18 +22,20 @@ ${hipack}: ${hipack_OBJS}
 	${AR} rcu ${hipack} ${hipack_OBJS}
 
 hipack-tools: \
+	${hipack_PATH}/tools/hipack-cat \
 	${hipack_PATH}/tools/hipack-parse \
 	${hipack_PATH}/tools/hipack-roundtrip
 
+${hipack_PATH}/tools/hipack-cat: \
+	${hipack_PATH}/tools/hipack-cat.o ${hipack}
+
 ${hipack_PATH}/tools/hipack-parse: \
 	${hipack_PATH}/tools/hipack-parse.o ${hipack}
 
 ${hipack_PATH}/tools/hipack-roundtrip: \
 	${hipack_PATH}/tools/hipack-roundtrip.o ${hipack}
 
-hipack-check: \
-		${hipack_PATH}/tools/hipack-parse \
-		${hipack_PATH}/tools/hipack-roundtrip
+hipack-check: hipack-tools
 	@${hipack_PATH}/tools/run-tests
 
 ${hipack_PATH}/hipack-writer.o: ${hipack_PATH}/fpconv/src/fpconv.c

tools/hipack-cat.c

@@ -0,0 +1,55 @@
+/*
+ * hipack-cat.c
+ * Copyright (C) 2015 Adrian Perez <aperez@igalia.com>
+ *
+ * Distributed under terms of the MIT license.
+ */
+
+#include "../hipack.h"
+#include <stdlib.h>
+#include <errno.h>
+
+
+int
+main (int argc, const char *argv[])
+{
+    if (argc != 2) {
+        fprintf (stderr, "Usage: %s PATH\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    FILE *fp = fopen (argv[1], "rb");
+    if (!fp) {
+        fprintf (stderr, "%s: Cannot open '%s' (%s)\n",
+                 argv[0], argv[1], strerror (errno));
+        return EXIT_FAILURE;
+    }
+
+    int retcode = EXIT_SUCCESS;
+    hipack_reader_t reader = {
+        .getchar = hipack_stdio_getchar,
+        .getchar_data = fp,
+    };
+    hipack_dict_t *message = hipack_read (&reader);
+    if (!message) {
+        assert (reader.error);
+        fprintf (stderr, "line %u, column %u: %s\n",
+                 reader.error_line, reader.error_column,
+                 (reader.error == HIPACK_READ_ERROR)
+                    ? strerror (errno) : reader.error);
+        retcode = EXIT_FAILURE;
+        goto cleanup;
+    }
+
+    hipack_writer_t writer = {
+        .putchar = hipack_stdio_putchar,
+        .putchar_data = stdout,
+    };
+    hipack_write (&writer, message);
+
+cleanup:
+    fclose (fp);
+    hipack_dict_free (message);
+    return retcode;
+}
+