inputline variant which uses a source

diff --git a/lib/inputline.c b/lib/inputline.c
index b9a7df802f4972ce1b1bc25089212de4dd7dcbec..53b0ffc9d59b543f3979dd92f251534dbac2e01e 100644 (file)
--- a/lib/inputline.c
+++ b/lib/inputline.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2007-9, 2013 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include "vector.h"
 #include "charset.h"
 #include "inputline.h"
+#include "sink.h"
 
 /** @brief Read a line from @p fp
  * @param tag Used in error messages
@@ -46,12 +47,20 @@
  * @p *lp is only set if the return value was 0.
  */
 int inputline(const char *tag, FILE *fp, char **lp, int newline) {
+  struct source *s = source_stdio(fp);
+  int rc = inputlines(tag, s, lp, newline);
+  xfree(s);
+  return rc;
+}
+
+int inputlines(const char *tag, struct source *s, char **lp, int newline) {
   struct dynstr d;
-  int ch;
+  int ch, err;
+  char errbuf[1024];
 
   dynstr_init(&d);
-  while((ch = getc(fp)),
-       (!ferror(fp) && !feof(fp) && ch != newline)) {
+  while((ch = source_getc(s)),
+       (!source_err(s) && !source_eof(s) && ch != newline)) {
     dynstr_append(&d, ch);
     if(newline == CRLF && d.nvec >= 2
        && d.vec[d.nvec - 2] == 0x0D && d.vec[d.nvec - 1] == 0x0A) {
@@ -59,10 +68,11 @@ int inputline(const char *tag, FILE *fp, char **lp, int newline) {
       break;
     }
   }
-  if(ferror(fp)) {
-    disorder_error(errno, "error reading %s", tag);
+  if((err = source_err(s))) {
+    disorder_error(0, "error reading %s: %s", tag,
+                   format_error(s->eclass, err, errbuf, sizeof errbuf));
     return -1;
-  } else if(feof(fp)) {
+  } else if(source_eof(s)) {
     if(d.nvec != 0)
       disorder_error(0, "error reading %s: unexpected EOF", tag);
     return -1;

diff --git a/lib/inputline.h b/lib/inputline.h
index a844194c6382fe5fa853143f58b8d4ed7854f276..8f8761b0d5ac80168cffecd0a95e4aecdb53259a 100644 (file)
--- a/lib/inputline.h
+++ b/lib/inputline.h
@@ -22,6 +22,9 @@
 #ifndef INPUTLINE_H
 #define INPUTLINE_H
 
+struct source;
+
+int inputlines(const char *tag, struct source *s, char **lp, int newline);
 int inputline(const char *tag, FILE *fp, char **lp, int newline);
 /* read characters from @fp@ until @newline@ is encountered.  Store
  * them (excluding @newline@) via @lp@.  Return 0 on success, -1 on