shithub: scc

Info  •  Files  •  Log  •  Branches

cc1: Fix escape in macro expansion

Copymacro() was copying without worring about escape characters
making the expansion of the macro wrong.
.

--- a/src/cmd/cc/cc1/cpp.c

+++ b/src/cmd/cc/cc1/cpp.c

@@ -184,7 +184,7 @@

 static size_t

 copymacro(char *buffer, char *s, size_t bufsiz, char *arglist[])

 {

-	int delim, prevc, c;

+	int delim, prevc, c, esc;

 	char *p, *arg, *bp = buffer;

 	size_t size;

@@ -203,8 +203,16 @@

 		case '\"':

 			delim = '"';

 		search_delim:

-			for (p = s; *++s != delim; )

-				;

+			esc = 0;

+			p = s;

+			for (++s; c = *s; ++s) {

+				if (c == '\\' && !esc)

+					esc = 1;

+				else if (c == delim &&!esc)

+					break;

+				else

+					esc = 0;

+			}

 			size = s - p + 1;

 			if (size > bufsiz)

 				goto expansion_too_long;