/* printf wrappers that fail immediately for non-file-related errors
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "xprintf.h"
#include <errno.h>
-#include <stdarg.h>
#include "error.h"
#include "exitfail.h"
/* 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 && (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 && (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;
}