1 files changed, 34 insertions, 3 deletions

diff --git a/stream/upb_stdio.c b/stream/upb_stdio.c
index 7cbca91..89a6621 100644
--- a/stream/upb_stdio.c
+++ b/stream/upb_stdio.c
@@ -6,6 +6,10 @@
 
 #include "upb_stdio.h"
 
+#include <stddef.h>
+#include <stdlib.h>
+#include "upb_string.h"
+
 // We can make this configurable if necessary.
 #define BLOCK_SIZE 4096
 
@@ -13,11 +17,15 @@ struct upb_stdio {
   upb_bytesrc bytesrc;
   upb_bytesink bytesink;
   FILE *file;
+};
+
+void upb_stdio_reset(upb_stdio *stdio, FILE* file) {
+  stdio->file = file;
 }
 
 static bool upb_stdio_read(upb_stdio *stdio, upb_string *str,
-                           int offset, int bytes_to_read) {
-  char *buf = upb_string_getrwbuf(offset + bytes_to_read) + offset;
+                           int offset, size_t bytes_to_read) {
+  char *buf = upb_string_getrwbuf(str, offset + bytes_to_read) + offset;
   size_t read = fread(buf, 1, bytes_to_read, stdio->file);
   if(read < bytes_to_read) {
     // Error or EOF.
@@ -44,7 +52,7 @@ bool upb_stdio_append(upb_bytesrc *src, upb_string *str, upb_strlen_t len) {
   return upb_stdio_read((upb_stdio*)src, str, upb_string_len(str), len);
 }
 
-int32_t upb_bytesink_put(upb_bytesink *sink, upb_string *str) {
+int32_t upb_stdio_put(upb_bytesink *sink, upb_string *str) {
   upb_stdio *stdio = (upb_stdio*)sink - offsetof(upb_stdio, bytesink);
   upb_strlen_t len = upb_string_len(str);
   size_t written = fwrite(upb_string_getrobuf(str), 1, len, stdio->file);
@@ -59,3 +67,26 @@ int32_t upb_bytesink_put(upb_bytesink *sink, upb_string *str) {
   }
   return written;
 }
+
+static upb_bytesrc_vtable upb_stdio_bytesrc_vtbl = {
+  (upb_bytesrc_get_fptr)upb_stdio_get,
+  (upb_bytesrc_append_fptr)upb_stdio_append,
+};
+
+static upb_bytesink_vtable upb_stdio_bytesink_vtbl = {
+  upb_stdio_put
+};
+
+upb_stdio *upb_stdio_new() {
+  upb_stdio *stdio = malloc(sizeof(*stdio));
+  upb_bytesrc_init(&stdio->bytesrc, &upb_stdio_bytesrc_vtbl);
+  upb_bytesink_init(&stdio->bytesink, &upb_stdio_bytesink_vtbl);
+  return stdio;
+}
+
+void upb_stdio_free(upb_stdio *stdio) {
+  free(stdio);
+}
+
+upb_bytesrc* upb_stdio_bytesrc(upb_stdio *stdio) { return &stdio->bytesrc; }
+upb_bytesink* upb_stdio_bytesink(upb_stdio *stdio) { return &stdio->bytesink; }