X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=lexer.l.m4;h=20a5e9f44698a9cc7a91fa5710dc5172f2eefce9;hb=26cf1562f35e53b9c54be0887650feef48550343;hp=849f233115545749f24e1f0ff6d78e574789dc14;hpb=db59ee1476515a65cfcca10a3059d8ccb2d24d32;p=userv.git

diff --git a/lexer.l.m4 b/lexer.l.m4
index 849f233..20a5e9f 100644
--- a/lexer.l.m4
+++ b/lexer.l.m4
@@ -1,7 +1,7 @@
 dnl  userv - lexer.l.m4
 dnl  lexer, passed through m4 with defs from langauge.i4
 /*
- *   Copyright (C)1996-1997 Ian Jackson
+ *   Copyright (C)1996-1997,9 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
@@ -33,8 +33,10 @@ include(language.i4)
 #include <fnmatch.h>
 #include <limits.h>
 #include <dirent.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <time.h>
+#include <errno.h>
 
 #include "config.h"
 #include "common.h"
@@ -176,14 +178,14 @@ changequote({*,*})
 			  parseerrprint("missing newline at eof after comment");
 			  return tokv_error;
 			}
-[^\ \t\n]+		return tokv_barestring;
-\"([^\\\"\n]|\\[a-z]|\\[0-9]{3}|\\x[0-9A-Fa-f]{2}|\\[:punct:]|\\[ \t]*\n)*\" {
+\"([^\\\"\n]|\\[a-z]|\\[0-9]{3}|\\x[0-9A-Fa-f]{2}|\\[[:punct:]]|\\[ \t]*\n)*\" {
 			  return dequote(yytext);
 			}
 \".*    		{
 			  parseerrprint("misquoted or unterminated string");
 			  return tokv_error;
 			}
+[^\ \t\n]+		return tokv_barestring;
 <<EOF>>		        return tokv_eof;
 *}
 changequote(`,')