CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:    src
Committed By:   sjg
Date:           Thu Apr 29 23:12:21 UTC 2010

Modified Files:
        src/usr.bin/make: main.c parse.c

Log Message:
fflush stdout, before writing to stderr.


To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/usr.bin/make/main.c
cvs rdiff -u -r1.162 -r1.163 src/usr.bin/make/parse.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/make/main.c
diff -u src/usr.bin/make/main.c:1.183 src/usr.bin/make/main.c:1.184
--- src/usr.bin/make/main.c:1.183	Fri Apr 23 00:18:50 2010
+++ src/usr.bin/make/main.c	Thu Apr 29 23:12:21 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.183 2010/04/23 00:18:50 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.184 2010/04/29 23:12:21 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.183 2010/04/23 00:18:50 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.184 2010/04/29 23:12:21 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.183 2010/04/23 00:18:50 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.184 2010/04/29 23:12:21 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1695,6 +1695,7 @@
 	err_file = debug_file;
 	if (err_file == stdout)
 		err_file = stderr;
+	(void)fflush(stdout);
 	for (;;) {
 		va_start(ap, fmt);
 		fprintf(err_file, "%s: ", progname);
@@ -1729,6 +1730,7 @@
 	if (jobsRunning)
 		Job_Wait();
 
+	(void)fflush(stdout);
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	(void)fprintf(stderr, "\n");
@@ -1760,6 +1762,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
+	(void)fflush(stdout);
 	(void)fprintf(stderr, "%s: ", progname);
 	(void)vfprintf(stderr, fmt, ap);
 	va_end(ap);

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.162 src/usr.bin/make/parse.c:1.163
--- src/usr.bin/make/parse.c:1.162	Thu Apr  8 17:41:29 2010
+++ src/usr.bin/make/parse.c	Thu Apr 29 23:12:21 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.162 2010/04/08 17:41:29 sjg Exp $	*/
+/*	$NetBSD: parse.c,v 1.163 2010/04/29 23:12:21 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.162 2010/04/08 17:41:29 sjg Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.163 2010/04/29 23:12:21 sjg 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.162 2010/04/08 17:41:29 sjg Exp $");
+__RCSID("$NetBSD: parse.c,v 1.163 2010/04/29 23:12:21 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -451,6 +451,7 @@
 	va_list ap;
 
 	va_start(ap, fmt);
+	(void)fflush(stdout);
 	ParseVErrorInternal(stderr, cfname, clineno, type, fmt, ap);
 	va_end(ap);
 
@@ -489,6 +490,7 @@
 	}
 
 	va_start(ap, fmt);
+	(void)fflush(stdout);
 	ParseVErrorInternal(stderr, fname, lineno, type, fmt, ap);
 	va_end(ap);
 
@@ -2712,6 +2714,7 @@
     } while (ParseEOF() == CONTINUE);
 
     if (fatals) {
+	(void)fflush(stdout);
 	(void)fprintf(stderr,
 	    "%s: Fatal errors encountered -- cannot continue\n",
 	    progname);