/*
* 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
#include "log.h"
#include "mem.h"
#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
* @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) {
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;
- } else if(feof(fp)) {
+ } else if(source_eof(s)) {
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);