diff --git a/usr.sbin/config.new/scan.l b/usr.sbin/config.new/scan.l index 80cecb2aac1f..88b32255ca21 100644 --- a/usr.sbin/config.new/scan.l +++ b/usr.sbin/config.new/scan.l @@ -114,7 +114,7 @@ needs-flag { yylval.val = FI_NEEDSFLAG; return FFLAG; } {PATH} { yylval.str = intern(yytext); return PATHNAME; } {WORD} { yylval.str = intern(yytext); return WORD; } -\"[^"]+/\" { +\"([^"]|\\\")*/\" { yylval.str = intern(yytext + 1); (void)input(); /* eat closing quote */ return WORD; diff --git a/usr.sbin/config.old/lang.l b/usr.sbin/config.old/lang.l index 3da1834ae8ea..6e7602a01ff9 100644 --- a/usr.sbin/config.old/lang.l +++ b/usr.sbin/config.old/lang.l @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)lang.l 5.8 (Berkeley) 4/19/91 - * $Id: lang.l,v 1.4 1993/12/01 05:56:44 deraadt Exp $ + * $Id: lang.l,v 1.5 1993/12/03 04:58:22 deraadt Exp $ */ #include @@ -124,9 +124,10 @@ WORD [A-Za-z_][-A-Za-z_]* tprintf("(%s) ", yytext); return i; } -\"[^"]+\" { +\"([^\"]|\\\")*\" { yytext[strlen(yytext)-1] = '\0'; yylval.str = yytext + 1; + tprintf("QID: %s", yylval.str); return ID; } 0[0-7]* { diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l index 3da1834ae8ea..6e7602a01ff9 100644 --- a/usr.sbin/config/lang.l +++ b/usr.sbin/config/lang.l @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)lang.l 5.8 (Berkeley) 4/19/91 - * $Id: lang.l,v 1.4 1993/12/01 05:56:44 deraadt Exp $ + * $Id: lang.l,v 1.5 1993/12/03 04:58:22 deraadt Exp $ */ #include @@ -124,9 +124,10 @@ WORD [A-Za-z_][-A-Za-z_]* tprintf("(%s) ", yytext); return i; } -\"[^"]+\" { +\"([^\"]|\\\")*\" { yytext[strlen(yytext)-1] = '\0'; yylval.str = yytext + 1; + tprintf("QID: %s", yylval.str); return ID; } 0[0-7]* {