Merge from disorder.dev.

[disorder] / lib / inputline.h

diff --git a/lib/inputline.h b/lib/inputline.h
index 57d397599438554bf46a4e5d75c4d5b7b7f00579..a844194c6382fe5fa853143f58b8d4ed7854f276 100644 (file)
--- a/lib/inputline.h
+++ b/lib/inputline.h
@@ -1,21 +1,22 @@
 /*
  * 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
+ * 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
- * 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.
- *
- * 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
- * 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.h
+ * @brief Line input
  */
 
 #ifndef INPUTLINE_H
@@ -26,6 +27,9 @@ int inputline(const char *tag, FILE *fp, char **lp, int newline);
  * them (excluding @newline@) via @lp@.  Return 0 on success, -1 on
  * error/eof. */
 
+/** @brief Magic @p newline value to make inputline() insist on CRLF */
+#define CRLF 0x100
+
 #endif /* INPUTLINE_H */
 
 /*