X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/c36e735af553de4bc1776977341bd95b64483f72..096c89c34505cadba1fc6e7a5367273d5c5bea47:/conf.c

diff --git a/conf.c b/conf.c
index 57947ca..70b6506 100644
--- a/conf.c
+++ b/conf.c
@@ -1,84 +1,30 @@
 /* -*-c-*-
  *
- * $Id: conf.c,v 1.10 2002/02/22 23:42:56 mdw Exp $
- *
  * Configuration parsing
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
- * This file is part of the `fw' port forwarder.
+ * This file is part of the `fwd' port forwarder.
  *
- * `fw' is free software; you can redistribute it and/or modify
+ * `fwd' 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
  * (at your option) any later version.
- * 
- * `fw' is distributed in the hope that it will be useful,
+ *
+ * `fwd' 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 `fw'; if not, write to the Free Software Foundation,
+ * along with `fwd'; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: conf.c,v $
- * Revision 1.10  2002/02/22 23:42:56  mdw
- * `fw'-specific configuration code moved out.  This file might become part
- * of a library some day.
- *
- * Revision 1.9  2002/01/13 14:48:16  mdw
- * Make delimiters be a property of a scanner.  Change the delimiter-
- * changing functions' names.
- *
- * Revision 1.8  2001/02/03 20:33:26  mdw
- * Fix flags to be unsigned.
- *
- * Revision 1.7  2000/08/01 17:58:10  mdw
- * Fix subtleties with <ctype.h> functions.
- *
- * Revision 1.6  2000/02/12 18:13:20  mdw
- * Terminate tables of sources and targets.
- *
- * Revision 1.5  1999/10/22 22:46:44  mdw
- * Improve documentation for conf_enum.
- *
- * Revision 1.4  1999/10/15 21:12:36  mdw
- * Remove redundant debugging code.
- *
- * Revision 1.3  1999/08/19 18:32:48  mdw
- * Improve lexical analysis.  In particular, `chmod' patterns don't have to
- * be quoted any more.
- *
- * Revision 1.2  1999/07/26 23:28:39  mdw
- * Major reconstruction work for new design.
- *
- * Revision 1.1.1.1  1999/07/01 08:56:23  mdw
- * Initial revision.
- *
- */
-
-/*----- Header files ------------------------------------------------------*/
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <mLib/dstr.h>
-#include <mLib/quis.h>
-#include <mLib/report.h>
-
-#include "conf.h"
-#include "scan.h"
+#include "fwd.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -423,4 +369,22 @@ void conf_name(scanner *sc, char delim, dstr *d)
 #undef f_bra
 }
 
+/* --- @conf_fname@ --- *
+ *
+ * Arguments:	@scanner *sc@ = pointer to scanner
+ *		@dstr *d@ = pointer to dynamic string for output
+ *
+ * Returns:	---
+ *
+ * Use:		Reads a file name from the input and stores it in @d@.
+ */
+
+void conf_fname(scanner *sc, dstr *d)
+{
+  const char fnchars[] = ".-+";
+  conf_undelim(sc, fnchars, fnchars);
+  conf_name(sc, '/', d);
+  conf_undelim(sc, 0, 0);
+}
+
 /*----- That's all, folks -------------------------------------------------*/