From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 3 Jun 2010 21:12:44 +0000 (+0200)
Subject: Support the HP compiler's preprocessor format
X-Git-Tag: v3.0~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db3e1b26f0a594f24bfc155c3d09f15a41990c68;p=thirdparty%2Fccache.git

Support the HP compiler's preprocessor format
---

diff --git a/ccache.c b/ccache.c
index 232d02a64..0acf649f8 100644
--- a/ccache.c
+++ b/ccache.c
@@ -458,8 +458,30 @@ static int process_preprocessed_file(struct mdfour *hash, const char *path)
 	end = data + size;
 	p = data;
 	q = data;
-	while (q < end - 1) {
-		if (q[0] == '#' && q[1] == ' ' /* Need to avoid "#pragma"... */
+	while (q < end - 7) { /* There must be at least 7 characters (# 1 "x") left
+	                         to potentially find an include file path. */
+		/*
+		 * Check if we look at a line containing the file name of an included file.
+		 * At least the following formats exist (where N is a positive integer):
+		 *
+		 * GCC:
+		 *
+		 *   # N "file"
+		 *   # N "file" N
+		 *
+		 * HP's compiler:
+		 *
+		 *   #line N "file"
+		 *
+		 * Note that there may be other lines starting with '#' left after
+		 * preprocessing as well, for instance "#    pragma".
+		 */
+		if (q[0] == '#'
+		        /* GCC: */
+		    && ((q[1] == ' ' && q[2] >= '0' && q[2] <= '9')
+		        /* HP: */
+		        || (q[1] == 'l' && q[2] == 'i' && q[3] == 'n' && q[4] == 'e'
+		            && q[5] == ' '))
 		    && (q == data || q[-1] == '\n')) {
 			char *path;