[src/netbsd-6]: src/usr.bin/m4 Pull up following revision(s) (requested by ch...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba1d5b30920e
branches:  netbsd-6
changeset: 774057:ba1d5b30920e
user:      riz <riz%NetBSD.org@localhost>
date:      Mon May 07 16:26:47 2012 +0000

description:
Pull up following revision(s) (requested by christos in ticket #217):
        usr.bin/m4/main.c: revision 1.42
Fix wrong loop index leading to infinite loop
ifdef(`FOO',
)
XXX: Pullup to 6.

diffstat:

 usr.bin/m4/main.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r e1e715e28d5d -r ba1d5b30920e usr.bin/m4/main.c
--- a/usr.bin/m4/main.c Mon May 07 16:25:42 2012 +0000
+++ b/usr.bin/m4/main.c Mon May 07 16:26:47 2012 +0000
@@ -1,5 +1,5 @@
 /*     $OpenBSD: main.c,v 1.77 2009/10/14 17:19:47 sthen Exp $ */
-/*     $NetBSD: main.c,v 1.41 2011/09/06 18:16:01 joerg Exp $  */
+/*     $NetBSD: main.c,v 1.41.4.1 2012/05/07 16:26:47 riz Exp $        */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.41 2011/09/06 18:16:01 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.41.4.1 2012/05/07 16:26:47 riz Exp $");
 #include <assert.h>
 #include <signal.h>
 #include <err.h>
@@ -494,7 +494,7 @@
                default:
                        if (LOOK_AHEAD(t, scommt)) {
                                char *q;
-                               for (q = scommt; *q; p++)
+                               for (q = scommt; *q; q++)
                                        chrsave(*q);
                                for(;;) {
                                        t = gpbc();