From 9c65c408580c78b9e1020f61fb465eb454f35304 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Anders=20Bj=C3=B6rklund?= Date: Thu, 14 Jul 2016 23:22:25 +0200 Subject: [PATCH] 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. --- ccache.c | 2 ++ 1 file changed, 2 insertions(+) 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 \"\"\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 \"\" 2\n")) { -- 2.47.2