fix parsing bug

diff --git a/debian/changelog b/debian/changelog
index faa29e46486098043a67e47f8d850c76550d7d04..fa52309a9cdcbfc7905160b8beb06adf68a4f9fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-userv (1.0.7~~iwj) unstable; urgency=low
+userv (1.1.0~~iwj) unstable; urgency=low
 
+  Bugfix:
+  * Do not reject comments and blank lines inside not-being-executed
+    conditional clauses.  (Closes: #613862.)
+
+  General improvements:
   * Introduce a use of socklen_t to avoid a compiler warning.
   * Remove spec.html and spec.ps from revision control.
   * Revision control switched from cvs to git.

diff --git a/parser.c b/parser.c
index e063bf9b3a983a50d8a7a31c83bf404c02aed399..037e6f9fe19a49eef2b4a88fac87e80645acb964 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -422,7 +422,7 @@ static int skip(int allowce) {
 
   for (;;) { /* loop over lines */
     cstate->reportlineno= cstate->lineno;
-    do { token= yylex(); } while (token == tokv_lwsp);
+    do { token= yylex(); } while (token == tokv_lwsp || token == tokv_newline);
     if (token & tokt_exception) {
       return token;
     } else if (token & tokt_controlend) {