Replace serdi -b and -e options with a block size option

This is more powerful, and reduces the number of command line options that
almost nobody needs to care about.

1 files changed, 24 insertions, 13 deletions

diff --git a/src/console.c b/src/console.c
index 2cc908ef..df1bc2ff 100644
--- a/src/console.c
+++ b/src/console.c
@@ -15,7 +15,6 @@
 */
 
 #include "console.h"
-#include "system.h"
 
 #include "serd/serd.h"
 
@@ -27,6 +26,7 @@
 #  include <io.h>
 #endif
 
+#include <stdint.h>
 #include <string.h>
 
 void
@@ -56,8 +56,24 @@ serd_print_version(const char* const program)
   return 0;
 }
 
+/// Wrapper for getc that is compatible with SerdReadFunc but faster than fread
+static size_t
+serd_file_read_byte(void* buf, size_t size, size_t nmemb, void* stream)
+{
+  (void)size;
+  (void)nmemb;
+
+  const int c = getc((FILE*)stream);
+  if (c == EOF) {
+    *((uint8_t*)buf) = 0;
+    return 0;
+  }
+  *((uint8_t*)buf) = (uint8_t)c;
+  return 1;
+}
+
 SerdByteSource*
-serd_open_input(const char* const filename, const size_t page_size)
+serd_open_input(const char* const filename, const size_t block_size)
 {
   SerdByteSource* byte_source = NULL;
   if (!strcmp(filename, "-")) {
@@ -65,31 +81,26 @@ serd_open_input(const char* const filename, const size_t page_size)
 
     SerdNode* name = serd_new_string(SERD_STRING("stdin"));
 
-    byte_source = serd_byte_source_new_function(serd_file_read_byte,
-                                                (SerdStreamErrorFunc)ferror,
-                                                NULL,
-                                                stdin,
-                                                name,
-                                                page_size);
+    byte_source = serd_byte_source_new_function(
+      serd_file_read_byte, (SerdStreamErrorFunc)ferror, NULL, stdin, name, 1);
 
     serd_node_free(name);
   } else {
-    byte_source = serd_byte_source_new_filename(filename, page_size);
+    byte_source = serd_byte_source_new_filename(filename, block_size);
   }
 
   return byte_source;
 }
 
 SerdByteSink*
-serd_open_output(const char* const filename, const size_t page_size)
+serd_open_output(const char* const filename, const size_t block_size)
 {
   if (!filename || !strcmp(filename, "-")) {
     serd_set_stream_utf8_mode(stdout);
-    return serd_byte_sink_new_function(
-      (SerdWriteFunc)fwrite, stdout, page_size);
+    return serd_byte_sink_new_function((SerdWriteFunc)fwrite, stdout, 1);
   }
 
-  return serd_byte_sink_new_filename(filename, page_size);
+  return serd_byte_sink_new_filename(filename, block_size);
 }
 
 SerdStatus