Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/usr.bin/make Pull up revision 1.102 (requested by rpaulo ...



details:   https://anonhg.NetBSD.org/src/rev/afed09edc6aa
branches:  netbsd-3
changeset: 576395:afed09edc6aa
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 16:23:07 2005 +0000

description:
Pull up revision 1.102 (requested by rpaulo in ticket #491):
PR standards/17732: make doesn't honour escaped comment lines. Now with
a real fix.
Ok'ed by sjg and hubertf.

diffstat:

 usr.bin/make/parse.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r f0723b88fdd9 -r afed09edc6aa usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Jul 02 16:22:47 2005 +0000
+++ b/usr.bin/make/parse.c      Sat Jul 02 16:23:07 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.97.2.2 2005/06/16 09:53:24 tron Exp $      */
+/*     $NetBSD: parse.c,v 1.97.2.3 2005/07/02 16:23:07 tron Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.97.2.2 2005/06/16 09:53:24 tron Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.97.2.3 2005/07/02 16:23:07 tron Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.97.2.2 2005/06/16 09:53:24 tron Exp $");
+__RCSID("$NetBSD: parse.c,v 1.97.2.3 2005/07/02 16:23:07 tron Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2552,6 +2552,13 @@
                         */
                        do {
                            c = ParseReadc();
+                           /*
+                            * If we found a backslash not escaped
+                            * itself it means that the comment is
+                            * going to continue in the next line.
+                            */
+                           if (c == '\\')
+                               ParseReadc();
                        } while ((c != '\n') && (c != EOF));
                        goto line_read;
                    } else {



Home | Main Index | Thread Index | Old Index