X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxprintf.c;h=8f279faf41b00f553bff69841f85ed40e0866241;hb=44cf2af4b0218a87870a2409c71d2309b6756bd7;hp=908fc4f11e8122305705aa87434c3d8c14b9318b;hpb=d9d370720f15fe910f40603a734f67e28b261cc2;p=gnulib.git
diff --git a/lib/xprintf.c b/lib/xprintf.c
index 908fc4f11..8f279faf4 100644
--- a/lib/xprintf.c
+++ b/lib/xprintf.c
@@ -14,14 +14,11 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "xprintf.h"
#include
-#include
#include "error.h"
#include "exitfail.h"
@@ -29,30 +26,54 @@
/* written by Jim Meyering */
-/* Just like printf, but call error if it fails for any reason
- for which printf does not set the stream error indicator. */
+/* Just like printf, but call error if it fails without setting the
+ stream's error indicator. */
int
xprintf (char const *restrict format, ...)
{
va_list args;
+ int retval;
va_start (args, format);
- int err = vprintf (format, args);
- if (err < 0 && (errno == EILSEQ || errno == EINVAL || errno == ENOMEM))
- error (exit_failure, errno, gettext ("write error"));
+ retval = xvprintf (format, args);
+ va_end (args);
- return err;
+ return retval;
}
-/* Just like fprintf, but call error if it fails for any reason
- for which printf does not set the stream error indicator. */
+/* Just like vprintf, but call error if it fails without setting the
+ stream's error indicator. */
+int
+xvprintf (char const *restrict format, va_list args)
+{
+ int retval = vprintf (format, args);
+ if (retval < 0 && ! ferror (stdout))
+ error (exit_failure, errno, gettext ("cannot perform formatted output"));
+
+ return retval;
+}
+
+/* Just like fprintf, but call error if it fails without setting the
+ stream's error indicator. */
int
xfprintf (FILE *restrict stream, char const *restrict format, ...)
{
va_list args;
+ int retval;
va_start (args, format);
- int err = vfprintf (stream, format, args);
- if (err < 0 && (errno == EILSEQ || errno == EINVAL || errno == ENOMEM))
- error (exit_failure, errno, gettext ("write error"));
+ retval = xvfprintf (stream, format, args);
+ va_end (args);
+
+ return retval;
+}
+
+/* Just like vfprintf, but call error if it fails without setting the
+ stream's error indicator. */
+int
+xvfprintf (FILE *restrict stream, char const *restrict format, va_list args)
+{
+ int retval = vfprintf (stream, format, args);
+ if (retval < 0 && ! ferror (stream))
+ error (exit_failure, errno, gettext ("cannot perform formatted output"));
- return err;
+ return retval;
}