X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=lexer.l.m4;h=0c6416d7f0266a02f753b2cd45aedd79e47db59b;hp=5aaeff088b312349b22732ce2ce0bca3738731a4;hb=HEAD;hpb=7bc3c582a0a80d34d2c9c86ed9a588b3983e0db1

diff --git a/lexer.l.m4 b/lexer.l.m4
index 5aaeff0..cc5421e 100644
--- a/lexer.l.m4
+++ b/lexer.l.m4
@@ -1,21 +1,21 @@
 dnl  userv - lexer.l.m4
 dnl  lexer, passed through m4 with defs from langauge.i4
 /*
- *   Copyright (C)1996-1997 Ian Jackson
- *  
- *   This 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.
- *  
- *   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 userv; if not, write to the Free Software
- *   Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * userv is copyright Ian Jackson and other contributors.
+ * See README for full authorship information.
+ *
+ * This 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 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with userv; if not, see <http://www.gnu.org/licenses/>.
  */
 
 %{
@@ -42,6 +42,7 @@ include(language.i4)
 #include "common.h"
 #include "daemon.h"
 #include "lib.h"
+#include "both.h"
 #include "tokens.h"
 
 #define HYPHEN '-'
@@ -50,7 +51,7 @@ typedef int directive_fnt(int dtoken);
 static directive_fnt df_reject, df_execute, df_executefrompath;
 static directive_fnt df_executefromdirectory, df_executebuiltin;
 static directive_fnt df_errorstostderr, df_errorstosyslog, df_errorstofile;
-static directive_fnt dfg_fdwant, dfg_setflag;
+static directive_fnt dfg_fdwant, dfg_setflag, dfg_lookupquotemode;
 static directive_fnt df_reset, df_cd, df_userrcfile, df_include;
 static directive_fnt df_includelookup, df_includedirectory;
 static directive_fnt df_message, df_error, df_quit, df_eof;
@@ -131,12 +132,14 @@ struct error_handling {
 static struct error_handling eh = { tokv_word_errorstostderr, 0,0,0,0,0 };
 
 static int dequote(char *inplace);
+static void countnewlines(void);
 
-#define YY_NO_UNPUT
+#define YY_NO_INPUT
 
 %}
 
 %option noyywrap
+%option nounput
 
 %%
 
@@ -154,42 +157,43 @@ changequote({*,*})
 			  char *ep;
 			  lr_min= (int)strtoul(yytext,&ep,10);
 			  assert(*ep == HYPHEN);
-			  assert(*++ep);
+			  ep++;  assert(*ep);
 			  lr_max= (int)strtoul(ep,&ep,10);
 			  assert(!*ep);
-			  if (lr_max < lr_min) {
-			    parseerrprint("fd range has min > max");
-			    return tokv_error;
-			  }
+			  if (lr_max < lr_min)
+			    return parseerrprint("fd range has min > max");
 			  return tokv_fdrange;
 			}
 [0-9]{1,8}-		{
 			  char *ep;
 			  lr_min= (int)strtoul(yytext,&ep,10);
 			  assert(*ep == HYPHEN);
-			  assert(!*++ep);
+			  ep++;  assert(!*ep);
 			  lr_max=-1;
 			  return tokv_fdstoend;
 			}
-[\ \t]+			return tokv_lwsp;
+([\ \t]*\\[\ \t]*\n[\ \t]*)+	countnewlines(); return tokv_lwsp;
+[\ \t]+				return tokv_lwsp;
 [\ \t]*\n		cstate->lineno++; return tokv_newline;
 [\ \t]*\#[^\n]*\n	cstate->lineno++; return tokv_newline;
-[\ \t]*\#[^\n]*		{
-			  parseerrprint("missing newline at eof after comment");
-			  return tokv_error;
-			}
+[\ \t]*\#[^\n]*		return parseerrprint("missing newline at eof after comment");
 \"([^\\\"\n]|\\[a-z]|\\[0-9]{3}|\\x[0-9A-Fa-f]{2}|\\[[:punct:]]|\\[ \t]*\n)*\" {
+			  countnewlines();
 			  return dequote(yytext);
 			}
-\".*    		{
-			  parseerrprint("misquoted or unterminated string");
-			  return tokv_error;
-			}
-[^\ \t\n]+		return tokv_barestring;
-<<EOF>>		        return tokv_eof;
+[^\ \t\n\\\"]+		return tokv_barestring;
+<<EOF>>			return tokv_eof;
+\"			return parseerrprint("misquoted or unterminated string");
+\\			return parseerrprint("unexpected backslash");
+.			abort(); /* expect lex warning "rule cannot be matched" */
 *}
 changequote(`,')
 %%
+
+const char *const builtinservicehelpstrings[]= {
+undivert(5)dnl
+   0
+};
 `
 #include "parser.c"
 '