Module Name: src Committed By: riz Date: Mon May 7 16:26:47 UTC 2012
Modified Files: src/usr.bin/m4 [netbsd-6]: main.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.41.4.1 src/usr.bin/m4/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/m4/main.c diff -u src/usr.bin/m4/main.c:1.41 src/usr.bin/m4/main.c:1.41.4.1 --- src/usr.bin/m4/main.c:1.41 Tue Sep 6 18:16:01 2011 +++ src/usr.bin/m4/main.c Mon May 7 16:26:47 2012 @@ -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 @@ macro(void) default: if (LOOK_AHEAD(t, scommt)) { char *q; - for (q = scommt; *q; p++) + for (q = scommt; *q; q++) chrsave(*q); for(;;) { t = gpbc();