From a2739882f22c18b16b87e9be4cd75cc95cfb6b98 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 17 Nov 2006 17:06:52 +0000
Subject: [PATCH] Fixed lex & yacc parsers for dbLoadTemplate() - this is now
 stricter in what it will accept, but any rejected characters weren't legal
 before anyway.

---
 src/dbtools/dbLoadTemplate.y     | 37 ++++++++++++---------
 src/dbtools/dbLoadTemplate_lex.l | 57 +++++++++++++++-----------------
 2 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/src/dbtools/dbLoadTemplate.y b/src/dbtools/dbLoadTemplate.y
index 7ff4d9e61..faee9d20c 100644
--- a/src/dbtools/dbLoadTemplate.y
+++ b/src/dbtools/dbLoadTemplate.y
@@ -1,10 +1,11 @@
 %{
 
-/**************************************************************************
- *
- *     Author:	Jim Kowalkowski
- *
- ***********************************************************************/
+/*************************************************************************\
+* Copyright (c) 2006 UChicago, as Operator of Argonne
+*     National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution. 
+\*************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,7 +39,7 @@ static int var_count,sub_count;
 %token <Str> WORD QUOTE
 %token DBFILE
 %token PATTERN
-%token EQUALS
+%token EQUALS COMMA
 %left O_PAREN C_PAREN
 %left O_BRACE C_BRACE
 
@@ -78,7 +79,7 @@ templ_head: DBFILE WORD
 		strcpy(db_file_name,$2);
 		dbmfFree($2);
 	}
-        | DBFILE QUOTE
+	| DBFILE QUOTE
 	{
 		var_count=0;
 		if(db_file_name) dbmfFree(db_file_name);
@@ -89,9 +90,9 @@ templ_head: DBFILE WORD
 	;
 
 subst: PATTERN pattern subs
-    | PATTERN pattern
-    | var_subs
-    ;
+	| PATTERN pattern
+	| var_subs
+	;
 
 pattern: O_BRACE vars C_BRACE
 	{ 
@@ -101,9 +102,10 @@ pattern: O_BRACE vars C_BRACE
 		fprintf(stderr,"var_count=%d\n",var_count);
 #endif
 	}
-    ;
+	;
 
 vars: vars var
+	| vars COMMA var
 	| var
 	;
 
@@ -150,6 +152,7 @@ sub: WORD O_BRACE vals C_BRACE
 	;
 
 vals: vals val
+	| vals COMMA val
 	| val
 	;
 
@@ -213,6 +216,7 @@ var_sub: WORD O_BRACE sub_pats C_BRACE
 	;
 
 sub_pats: sub_pats sub_pat
+	| sub_pats COMMA sub_pat
 	| sub_pat
 	;
 
@@ -242,13 +246,16 @@ sub_pat: WORD EQUALS WORD
  
 static int yyerror(char* str)
 {
-	fprintf(stderr,"Substitution file parse error : \"%s\"\n", str);
-	fprintf(stderr,"line %d:\"%s\"\n",line_num,yytext);
-	return(0);
+    if (str)
+	fprintf(stderr, "Substitution file error: %s\n", str);
+    else
+	fprintf(stderr, "Substitution file error.\n");
+    fprintf(stderr, "line %d: '%s'\n", line_num, yytext);
+    return 0;
 }
 
 static int is_not_inited = 1;
- 
+
 int epicsShareAPI dbLoadTemplate(char* sub_file)
 {
 	FILE *fp;
diff --git a/src/dbtools/dbLoadTemplate_lex.l b/src/dbtools/dbLoadTemplate_lex.l
index 22be59a5d..e6afdd1de 100644
--- a/src/dbtools/dbLoadTemplate_lex.l
+++ b/src/dbtools/dbLoadTemplate_lex.l
@@ -1,59 +1,56 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2006 UChicago, as Operator of Argonne
 *     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-word [a-zA-Z0-9_\.\^~/\*#\[\]%:;!|\-&\$\(\)@\?\+<>\']
-par [\"]
-
-notquote [^\"]
-escapequote \\\"
-value {notquote}|{escapequote}
-
-%{
-%}
+newline     "\n"
+backslash   "\\"
+doublequote "\""
+singlequote "'"
+comment     "#"
+whitespace  [ \t\r]
+escape      {backslash}.
+dstringchar [^\"\n\\]
+sstringchar [^\'\n\\]
+bareword    [a-zA-Z0-9_\.\^~/\*#\[\]%:;!|\-&\$\(\)@\?\+<>]
 
 %%
 
-\#.*\n	{ line_num++; }
+"pattern" { return(PATTERN);	}
+"file"    { return(DBFILE);	}
 
-"pattern" { return(PATTERN); }
-"file"    { return(DBFILE); }
-"="	  { return(EQUALS); }
-
-{par}{value}*{par} {
+{doublequote}({dstringchar}|{escape})*{doublequote} |
+{singlequote}({sstringchar}|{escape})*{singlequote} {
 	yylval.Str = dbmfStrdup(yytext+1);
 	yylval.Str[strlen(yylval.Str)-1] = '\0';
 	return(QUOTE);
     }
 
-{word}+ {
+{bareword}+ {
 	yylval.Str = dbmfStrdup(yytext);
 	return(WORD);
     }
 
+"="	{ return(EQUALS);	}
+","	{ return(COMMA);	}
 "{"	{ return(O_BRACE);	}
 "}"	{ return(C_BRACE);	}
 
-\n	{ line_num ++;}
-
-[ \t,]
+{comment}.*	;
+{whitespace}	;
+{newline}	{ line_num++;	}
 
 . {
-	char message[20];
-	YY_BUFFER_STATE *dummy=0;
+	char message[40];
 
-	sprintf(message,"invalid character '%c'",yytext[0]);
+	sprintf(message,"invalid character '%c'", yytext[0]);
 	yyerror(message);
 
-	/*The following suppress compiler warning messages*/
-	if (0) yyunput('c',(unsigned char *) message);
-	if (0) yy_switch_to_buffer(*dummy);
+	/* Suppress compiler warning messages */
+	if (0) yyunput('c',NULL);
+	if (0) yy_switch_to_buffer(NULL);
     }
 
 %%