From: Anders Björklund <anders@itension.se>
Date: Thu, 14 Jul 2016 21:22:25 +0000 (+0200)
Subject: Make sure to hash the trailing quote when skipping
X-Git-Tag: v3.2.7~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c65c408580c78b9e1020f61fb465eb454f35304;p=thirdparty%2Fccache.git

Make sure to hash the trailing quote when skipping

Turns out that 3.2-maint hashes preprocessor output a bit differently,
so the workaround for skipping certain lines was broken in backport.
When skipping the "extra line", the trailing quotes were missing from
the output causing the hash to be different from the normal output.
---

diff --git a/ccache.c b/ccache.c
index 624036c85..49b2092c8 100644
--- a/ccache.c
+++ b/ccache.c
@@ -755,9 +755,11 @@ process_preprocessed_file(struct mdfour *hash, const char *path)
 				if (str_startswith(q, "# 31 \"<command-line>\"\n")) {
 					/* Bogus extra line with #31, after the regular #1:
 					   Ignore the whole line, and continue parsing */
+					hash_buffer(hash, p, q - p);
 					while (q < end && *q != '\n') {
 						q++;
 					}
+					q++;
 					p = q;
 					continue;
 				} else if (str_startswith(q, "# 32 \"<command-line>\" 2\n")) {