Source code reorganization:

[disorder] / lib / inputline.c

diff --git a/lib/inputline.c b/lib/inputline.c
index 3202effe575923f4c758ee93a993087d7e5f5482..8882f573fcd5e45a8de5f8da8846cf4badf9b0e8 100644 (file)
--- 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
@@ -21,12 +21,9 @@
  * @brief Line input
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "log.h"
 #include "mem.h"
@@ -38,12 +35,16 @@
  * @param tag Used in error messages
  * @param fp Stream to read from
  * @param lp Where to store newly allocated string
- * @param newline Newline character
+ * @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) {
@@ -52,8 +53,14 @@ int inputline(const char *tag, FILE *fp, char **lp, int newline) {
 
   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;