From a1ef2207dd1f63a4104cfbf7927931174f5438a5 Mon Sep 17 00:00:00 2001
From: Erik Hollensbe <github@hollensbe.org>
Date: Wed, 15 Oct 2014 04:00:17 +0000
Subject: [PATCH] builder: strip blank lines before processing any line
 continuations.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
---
 builder/parser/parser.go                    | 4 ++++
 builder/parser/testfiles/escapes/Dockerfile | 6 ++++++
 builder/parser/testfiles/escapes/result     | 1 +
 3 files changed, 11 insertions(+)

diff --git a/builder/parser/parser.go b/builder/parser/parser.go
index c24a925e43..ae721cca46 100644
--- a/builder/parser/parser.go
+++ b/builder/parser/parser.go
@@ -98,6 +98,10 @@ func Parse(rwc io.Reader) (*Node, error) {
 	scanner := bufio.NewScanner(rwc)
 
 	for scanner.Scan() {
+		if scanner.Text() == "" {
+			continue
+		}
+
 		line, child, err := parseLine(strings.TrimLeftFunc(scanner.Text(), unicode.IsSpace))
 		if err != nil {
 			return nil, err
diff --git a/builder/parser/testfiles/escapes/Dockerfile b/builder/parser/testfiles/escapes/Dockerfile
index 87a8e028a2..1ffb17ef08 100644
--- a/builder/parser/testfiles/escapes/Dockerfile
+++ b/builder/parser/testfiles/escapes/Dockerfile
@@ -5,4 +5,10 @@ RUN apt-get \update && \
   apt-get \"install znc -y
 ADD \conf\\" /.znc
 
+RUN foo \
+
+bar \
+
+baz
+
 CMD [ "\/usr\\\"/bin/znc", "-f", "-r" ]
diff --git a/builder/parser/testfiles/escapes/result b/builder/parser/testfiles/escapes/result
index ffeb2a8960..13e409cb1a 100644
--- a/builder/parser/testfiles/escapes/result
+++ b/builder/parser/testfiles/escapes/result
@@ -2,4 +2,5 @@
 (maintainer "Erik \\\\Hollensbe <erik@hollensbe.org>\\\"")
 (run "apt-get \\update &&   apt-get \\\"install znc -y")
 (add "\\conf\\\\\"" "/.znc")
+(run "foo bar baz")
 (cmd "/usr\\\"/bin/znc" "-f" "-r")