lib/configuration.c, lib/home.c: Introduce environment variables.

[disorder] / lib / inputline.c

diff --git a/lib/inputline.c b/lib/inputline.c
index 855910f2a8f11e7afd74b18349feaae06d6493e6..aa8f68584c86267dcac0a29f04aa22b3b9a546cf 100644 (file)
--- a/lib/inputline.c
+++ b/lib/inputline.c
@@ -1,38 +1,33 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2004 Richard Kettlewell
+ * Copyright (C) 2004, 2007-9, 2013 Richard Kettlewell

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * 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
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  * (at your option) any later version.

- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 

  * You should have received a copy of the GNU General Public License
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */
 /** @file lib/inputline.c
  * @brief Line input
  */
 
  */
 /** @file lib/inputline.c
  * @brief Line input
  */
 

-#include <config.h>
-#include "types.h"
+#include "common.h"

 
 

-#include <stdio.h>

 #include <errno.h>
 #include <errno.h>

-#include <string.h>

 
 #include "log.h"
 #include "mem.h"
 #include "vector.h"
 
 #include "log.h"
 #include "mem.h"
 #include "vector.h"

-#include "charset.h"

 #include "inputline.h"
 #include "inputline.h"

+#include "sink.h"

 
 /** @brief Read a line from @p fp
  * @param tag Used in error messages
 
 /** @brief Read a line from @p fp
  * @param tag Used in error messages


@@ -51,12 +46,20 @@
  * @p *lp is only set if the return value was 0.
  */
 int inputline(const char *tag, FILE *fp, char **lp, int newline) {
  * @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;
   struct dynstr d;

-  int ch;
+  int ch, err;
+  char errbuf[1024];

 
   dynstr_init(&d);
 
   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) {
     dynstr_append(&d, ch);
     if(newline == CRLF && d.nvec >= 2
        && d.vec[d.nvec - 2] == 0x0D && d.vec[d.nvec - 1] == 0x0A) {


@@ -64,12 +67,13 @@ int inputline(const char *tag, FILE *fp, char **lp, int newline) {
       break;
     }
   }
       break;
     }
   }

-  if(ferror(fp)) {
-    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;
     return -1;

-  } else if(feof(fp)) {
+  } else if(source_eof(s)) {

     if(d.nvec != 0)
     if(d.nvec != 0)

-      error(0, "error reading %s: unexpected EOF", tag);
+      disorder_error(0, "error reading %s: unexpected EOF", tag);

     return -1;
   }
   dynstr_terminate(&d);
     return -1;
   }
   dynstr_terminate(&d);