Merge branch 'master' into feature/api-parser

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index af4040cb..25ed67a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* io.c (flush_io): Use r_fatal and r_warning for messagefunc
+	in the loop.
+
 2017-03-24         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* builtin.c (efwrite): Exit successfully upon EPIPE, as SIGPIPE
diff --git a/io.c b/io.c
index 7170590d..85025e45 100644
--- a/io.c
+++ b/io.c
@@ -1439,7 +1439,7 @@ flush_io()
 
 	// now for all open redirections
 	for (rp = red_head; rp != NULL; rp = rp->next) {
-		void (*messagefunc)(const char *mesg, ...) = fatal;
+		void (*messagefunc)(const char *mesg, ...) = r_fatal;
 
 		/* flush both files and pipes, what the heck */
 		if ((rp->flag & RED_WRITE) != 0 && rp->output.fp != NULL) {
@@ -1447,7 +1447,7 @@ flush_io()
 				update_ERRNO_int(errno);
 
 				if (is_non_fatal_redirect(rp->value, strlen(rp->value)))
-					messagefunc = warning;
+					messagefunc = r_warning;
 
 				if ((rp->flag & RED_PIPE) != 0)
 					messagefunc(_("pipe flush of `%s' failed (%s)."),