From 51709668ab2d7d701b415a1a85cfc66c83db4510 Mon Sep 17 00:00:00 2001
From: Evan Martin <martine@danga.com>
Date: Tue, 27 Dec 2011 13:39:09 -0800
Subject: [PATCH] fix depfile regex to not match empty strings

From a patch from Allan Odgaard <github@simplit.com>.
---
 src/depfile_parser.cc    | 23 +++++++++++------------
 src/depfile_parser.in.cc |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/depfile_parser.cc b/src/depfile_parser.cc
index b6166e6..5e718d9 100644
--- a/src/depfile_parser.cc
+++ b/src/depfile_parser.cc
@@ -74,10 +74,10 @@ bool DepfileParser::Parse(const string& content, string* err) {
       yych = *p;
       if (yych <= '@') {
         if (yych <= 0x1F) {
-          if (yych == '\n') goto yy5;
+          if (yych == '\n') goto yy4;
           goto yy7;
         } else {
-          if (yych <= ' ') goto yy5;
+          if (yych <= ' ') goto yy4;
           if (yych <= '*') goto yy7;
           if (yych <= ':') goto yy6;
           goto yy7;
@@ -85,21 +85,17 @@ bool DepfileParser::Parse(const string& content, string* err) {
       } else {
         if (yych <= '^') {
           if (yych <= 'Z') goto yy6;
-          if (yych == '\\') goto yy3;
-          goto yy7;
+          if (yych != '\\') goto yy7;
         } else {
           if (yych == '`') goto yy7;
           if (yych <= 'z') goto yy6;
           goto yy7;
         }
       }
-yy2:
-      { continue; }
-yy3:
       ++p;
       if ((yych = *p) == '\n') goto yy13;
       goto yy10;
-yy4:
+yy3:
       {
       // Got a filename.
       int len = p - start;;
@@ -116,9 +112,12 @@ yy4:
       }
       continue;
     }
-yy5:
-      yych = *++p;
+yy4:
+      ++p;
+      yych = *p;
       goto yy12;
+yy5:
+      { continue; }
 yy6:
       yych = *++p;
       goto yy10;
@@ -136,7 +135,7 @@ yy10:
       if (yybm[0+yych] & 64) {
         goto yy9;
       }
-      goto yy4;
+      goto yy3;
 yy11:
       ++p;
       if (end <= p) break;
@@ -145,7 +144,7 @@ yy12:
       if (yybm[0+yych] & 128) {
         goto yy11;
       }
-      goto yy2;
+      goto yy5;
 yy13:
       ++p;
       { continue; }
diff --git a/src/depfile_parser.in.cc b/src/depfile_parser.in.cc
index 4751550..4699e8f 100644
--- a/src/depfile_parser.in.cc
+++ b/src/depfile_parser.in.cc
@@ -47,7 +47,7 @@ bool DepfileParser::Parse(const string& content, string* err) {
     re2c:yych:emit = 0;
 
     '\\\n' { continue; }
-    [ \n]* { continue; }
+    [ \n]+ { continue; }
     [a-zA-Z0-9+,/\\_:.-]+ {
       // Got a filename.
       int len = p - start;;
-- 
2.7.4