X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..5aff007d8fcfb4c6cc3c3627ae15f45562db7a0d:/lib/inputline.c

diff --git a/lib/inputline.c b/lib/inputline.c
index 416162c..5af46f9 100644
--- a/lib/inputline.c
+++ b/lib/inputline.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004 Richard Kettlewell
+ * Copyright (C) 2004, 2007, 2008 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
@@ -17,6 +17,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
+/** @file lib/inputline.c
+ * @brief Line input
+ */
 
 #include <config.h>
 #include "types.h"
@@ -31,14 +34,36 @@
 #include "charset.h"
 #include "inputline.h"
 
+/** @brief Read a line from @p fp
+ * @param tag Used in error messages
+ * @param fp Stream to read from
+ * @param lp Where to store newly allocated string
+ * @param newline Newline character or @ref CRLF
+ * @return 0 on success, -1 on error or eof.
+ *
+ * The newline is not included in the string.  If the last line of a
+ * stream does not have a newline then that line is still returned.
+ *
+ * If @p newline is @ref CRLF then the line is terminated by CR LF,
+ * not by a single newline character.  The CRLF is still not included
+ * in the string in this case.
+ *
+ * @p *lp is only set if the return value was 0.
+ */
 int inputline(const char *tag, FILE *fp, char **lp, int newline) {
   struct dynstr d;
   int ch;
 
   dynstr_init(&d);
   while((ch = getc(fp)),
-	(!ferror(fp) && !feof(fp) && ch != newline))
+	(!ferror(fp) && !feof(fp) && ch != newline)) {
     dynstr_append(&d, ch);
+    if(newline == CRLF && d.nvec >= 2
+       && d.vec[d.nvec - 2] == 0x0D && d.vec[d.nvec - 1] == 0x0A) {
+      d.nvec -= 2;
+      break;
+    }
+  }
   if(ferror(fp)) {
     error(errno, "error reading %s", tag);
     return -1;