From 902c12f1a1b94eb0126996de17caf5039c7c14f6 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Thu, 9 Dec 2004 05:58:30 +0000
Subject: [PATCH] Reworded string defintion for clarity and to get rid of
 unescaped quotes in [].

---
 lib/cue_scan.l | 4 ++--
 lib/toc_scan.l | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cue_scan.l b/lib/cue_scan.l
index defd22d..ffceb6a 100644
--- a/lib/cue_scan.l
+++ b/lib/cue_scan.l
@@ -24,8 +24,8 @@ nonws		[^ \t\r\n]
 %%
 
 
-\'(\\.|[^\\'])*\'	|
-\"(\\.|[^\\"])*\"	{
+\'([^\']|\\\')*\'	|
+\"([^\"]|\\\")*\"	{
 		cue_yylval.sval = strdup(yytext + 1);
 		cue_yylval.sval[strlen(cue_yylval.sval) - 1] = '\0';
 		BEGIN(INITIAL);
diff --git a/lib/toc_scan.l b/lib/toc_scan.l
index c824f26..c0967a6 100644
--- a/lib/toc_scan.l
+++ b/lib/toc_scan.l
@@ -23,8 +23,8 @@ nonws		[^ \t\r\n]
 
 %%
 
-\'(\\.|[^\\'])*\'	|
-\"(\\.|[^\\"])*\"	{
+\'([^\']|\\\')*\'	|
+\"([^\"]|\\\")*\"	{
 		toc_yylval.sval = strdup(yytext + 1);
 		toc_yylval.sval[strlen(toc_yylval.sval) - 1] = '\0';
 		BEGIN(INITIAL);