Use "NONFATAL" for nonfatal I/O.

9 files changed, 38 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 61362b78..0727c927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-<<<<<<< HEAD
+2015-02-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* io.c: Make it "NONFATAL" everywhere.
+
 2015-02-08         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* awk.h (RED_NON_FATAL): Removed.
@@ -17,7 +20,7 @@
 	* awk.h (is_non_fatal_std): Declare new function.
 	* io.c (is_non_fatal_std): New function.
 	* builtin.c (efwrite): Call it.
-=======
+
 2015-02-07         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* regcomp.c, regex.c, regex.h, regex_internal.c, regex_internal.h,
@@ -119,7 +122,6 @@
 	* awkgram.y (extensions_used): New variable. Set it on @load.
 	(do_add_scrfile): Set it on -l.
 	(process_deferred): Check it also.
->>>>>>> master
 
 2014-12-24         Arnold D. Robbins     <arnold@skeeve.com>
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5d8c4a5e..3840f933 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,7 @@
 2015-02-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: O'Reilly fixes.
+	Make non-fatal i/o use "NONFATAL".
 
 2015-02-06         Arnold D. Robbins     <arnold@skeeve.com>
 
diff --git a/doc/gawk.info b/doc/gawk.info
index d83370e8..118c814a 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -7226,10 +7226,10 @@ error message of your choosing before exiting.  You can do this in one
 of two ways:
 
    * For all output files, by assigning any value to
-     `PROCINFO["nonfatal"]'.
+     `PROCINFO["NONFATAL"]'.
 
    * On a per-file basis, by assigning any value to `PROCINFO[FILENAME,
-     "nonfatal"]'.  Here, FILENAME is the name of the file to which you
+     "NONFATAL"]'.  Here, FILENAME is the name of the file to which you
      wish output to be nonfatal.
 
    Once you have enabled nonfatal output, you must check `ERRNO' after
@@ -7239,7 +7239,7 @@ attempting the output. For example:
 
      $ gawk '
      > BEGIN {
-     >     PROCINFO["nonfatal"] = 1
+     >     PROCINFO["NONFATAL"] = 1
      >     ERRNO = 0
      >     print "hi" > "/no/such/file"
      >     if (ERRNO) {
@@ -7253,9 +7253,9 @@ attempting the output. For example:
 program code detect the problem and handle it.
 
    This mechanism works also for standard output and standard error.
-For standard output, you may use `PROCINFO["-", "nonfatal"]' or
-`PROCINFO["/dev/stdout", "nonfatal"]'.  For standard error, use
-`PROCINFO["/dev/stderr", "nonfatal"]'.
+For standard output, you may use `PROCINFO["-", "NONFATAL"]' or
+`PROCINFO["/dev/stdout", "NONFATAL"]'.  For standard error, use
+`PROCINFO["/dev/stderr", "NONFATAL"]'.
 
 
 File: gawk.info,  Node: Output Summary,  Next: Output Exercises,  Prev: Nonfatal,  Up: Printing
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 81568fe7..1a239124 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -10458,11 +10458,11 @@ You can do this in one of two ways:
 
 @itemize @bullet
 @item
-For all output files, by assigning any value to @code{PROCINFO["nonfatal"]}.
+For all output files, by assigning any value to @code{PROCINFO["NONFATAL"]}.
 
 @item
 On a per-file basis, by assigning any value to
-@code{PROCINFO[@var{filename}, "nonfatal"]}.
+@code{PROCINFO[@var{filename}, "NONFATAL"]}.
 Here, @var{filename} is the name of the file to which
 you wish output to be nonfatal.
 @end itemize
@@ -10475,7 +10475,7 @@ see if something went wrong.  It is also a good idea to initialize
 @example
 $ @kbd{gawk '}
 > @kbd{BEGIN @{}
-> @kbd{    PROCINFO["nonfatal"] = 1}
+> @kbd{    PROCINFO["NONFATAL"] = 1}
 > @kbd{    ERRNO = 0}
 > @kbd{    print "hi" > "/no/such/file"}
 > @kbd{    if (ERRNO) @{}
@@ -10490,9 +10490,9 @@ Here, @command{gawk} did not produce a fatal error; instead
 it let the @command{awk} program code detect the problem and handle it.
 
 This mechanism works also for standard output and standard error.
-For standard output, you may use @code{PROCINFO["-", "nonfatal"]}
-or @code{PROCINFO["/dev/stdout", "nonfatal"]}.  For standard error, use
-@code{PROCINFO["/dev/stderr", "nonfatal"]}.
+For standard output, you may use @code{PROCINFO["-", "NONFATAL"]}
+or @code{PROCINFO["/dev/stdout", "NONFATAL"]}.  For standard error, use
+@code{PROCINFO["/dev/stderr", "NONFATAL"]}.
 
 @node Output Summary
 @section Summary
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index e127f428..1e833fe2 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -9954,11 +9954,11 @@ You can do this in one of two ways:
 
 @itemize @bullet
 @item
-For all output files, by assigning any value to @code{PROCINFO["nonfatal"]}.
+For all output files, by assigning any value to @code{PROCINFO["NONFATAL"]}.
 
 @item
 On a per-file basis, by assigning any value to
-@code{PROCINFO[@var{filename}, "nonfatal"]}.
+@code{PROCINFO[@var{filename}, "NONFATAL"]}.
 Here, @var{filename} is the name of the file to which
 you wish output to be nonfatal.
 @end itemize
@@ -9971,7 +9971,7 @@ see if something went wrong.  It is also a good idea to initialize
 @example
 $ @kbd{gawk '}
 > @kbd{BEGIN @{}
-> @kbd{    PROCINFO["nonfatal"] = 1}
+> @kbd{    PROCINFO["NONFATAL"] = 1}
 > @kbd{    ERRNO = 0}
 > @kbd{    print "hi" > "/no/such/file"}
 > @kbd{    if (ERRNO) @{}
@@ -9986,9 +9986,9 @@ Here, @command{gawk} did not produce a fatal error; instead
 it let the @command{awk} program code detect the problem and handle it.
 
 This mechanism works also for standard output and standard error.
-For standard output, you may use @code{PROCINFO["-", "nonfatal"]}
-or @code{PROCINFO["/dev/stdout", "nonfatal"]}.  For standard error, use
-@code{PROCINFO["/dev/stderr", "nonfatal"]}.
+For standard output, you may use @code{PROCINFO["-", "NONFATAL"]}
+or @code{PROCINFO["/dev/stdout", "NONFATAL"]}.  For standard error, use
+@code{PROCINFO["/dev/stderr", "NONFATAL"]}.
 
 @node Output Summary
 @section Summary
diff --git a/io.c b/io.c
index db8a0a2b..f975353e 100644
--- a/io.c
+++ b/io.c
@@ -1069,15 +1069,17 @@ getredirect(const char *str, int len)
 bool
 is_non_fatal_std(FILE *fp)
 {
-	if (in_PROCINFO("nonfatal", NULL, NULL))
+	static const char nonfatal[] = "NONFATAL";
+
+	if (in_PROCINFO(nonfatal, NULL, NULL))
 		return true;
 
 	/* yucky logic. sigh. */
 	if (fp == stdout) {
-		return (   in_PROCINFO("-", "nonfatal", NULL) != NULL
-		        || in_PROCINFO("/dev/stdout", "nonfatal", NULL) != NULL);
+		return (   in_PROCINFO("-", nonfatal, NULL) != NULL
+		        || in_PROCINFO("/dev/stdout", nonfatal, NULL) != NULL);
 	} else if (fp == stderr) {
-		return (in_PROCINFO("/dev/stderr", "nonfatal", NULL) != NULL);
+		return (in_PROCINFO("/dev/stderr", nonfatal, NULL) != NULL);
 	}
 
 	return false;
@@ -1088,8 +1090,8 @@ is_non_fatal_std(FILE *fp)
 bool
 is_non_fatal_redirect(const char *str)
 {
-	return in_PROCINFO("nonfatal", NULL, NULL) != NULL
-	       || in_PROCINFO(str, "nonfatal", NULL) != NULL;
+	return in_PROCINFO("NONFATAL", NULL, NULL) != NULL
+	       || in_PROCINFO(str, "NONFATAL", NULL) != NULL;
 }
 
 /* close_one --- temporarily close an open file to re-use the fd */
diff --git a/test/ChangeLog b/test/ChangeLog
index b0979d8a..e888c669 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-08         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* nonfatal1.awk, nonfatal2.awk: String is now "NONFATAL".
+
 2015-02-06         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (nonfatal1, nonfatal2): New tests.
diff --git a/test/nonfatal1.awk b/test/nonfatal1.awk
index 83661284..bf821d49 100644
--- a/test/nonfatal1.awk
+++ b/test/nonfatal1.awk
@@ -1,5 +1,5 @@
 BEGIN {
-	PROCINFO["nonfatal"]
+	PROCINFO["NONFATAL"]
 	print |& "/inet/tcp/0/ti10/357"
 	print ERRNO
 }
diff --git a/test/nonfatal2.awk b/test/nonfatal2.awk
index f5db71c5..fedbba43 100644
--- a/test/nonfatal2.awk
+++ b/test/nonfatal2.awk
@@ -1,5 +1,5 @@
 BEGIN {
-	PROCINFO["nonfatal"] = 1
+	PROCINFO["NONFATAL"] = 1
 	print > "/dev/no/such/file"
 	print ERRNO
 }