From: Jim Meyering <meyering@redhat.com>
Date: Fri, 19 Oct 2007 15:09:37 +0000 (+0200)
Subject: New module: xprintf
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78da34d40e6a244945b626932a23c90a4bec34f0;p=pspp

New module: xprintf

* modules/xprintf, lib/xprintf.c, lib/xprintf.h: New files.
---

diff --git a/ChangeLog b/ChangeLog
index 212ba807bc..ede13c3f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Jim Meyering  <meyering@redhat.com>
+
+	New module: xprintf
+	* modules/xprintf, lib/xprintf.c, lib/xprintf.h: New files.
+
 2007-10-19  Bruno Haible  <bruno@clisp.org>
 
 	* modules/csharpexec (Makefile.am): Use @FOO@ syntax instead of $(FOO)
diff --git a/lib/xprintf.c b/lib/xprintf.c
new file mode 100644
index 0000000000..a01eff8cdd
--- /dev/null
+++ b/lib/xprintf.c
@@ -0,0 +1,58 @@
+/* printf wrappers that fail immediately for non-file-related errors
+   Copyright (C) 2007 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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 "xprintf.h"
+
+#include <errno.h>
+#include <stdarg.h>
+
+#include "error.h"
+#include "exitfail.h"
+#include "gettext.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.  */
+int
+xprintf (char const *restrict format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  int err = vprintf (format, args);
+  if (err && (errno == EILSEQ || errno == EINVAL || errno == ENOMEM))
+    error (exit_failure, errno, gettext ("write error"));
+
+  return err;
+}
+
+/* Just like fprintf, but call error if it fails for any reason
+   for which printf does not set the stream error indicator.  */
+int
+xfprintf (FILE *restrict stream, char const *restrict format, ...)
+{
+  va_list args;
+  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"));
+
+  return err;
+}
diff --git a/lib/xprintf.h b/lib/xprintf.h
new file mode 100644
index 0000000000..4c0870cfe8
--- /dev/null
+++ b/lib/xprintf.h
@@ -0,0 +1,40 @@
+/* printf wrappers that fail immediately for non-file-related errors
+   Copyright (C) 2007 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _XPRINTF_H
+#define _XPRINTF_H
+
+#include <stdio.h>
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#  define __attribute__(Spec)	/* empty */
+# endif
+/* The __-protected variants of `format' and `printf' attributes
+   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __format__ format
+#  define __printf__ printf
+# endif
+#endif
+
+extern int xprintf (char const *restrict format, ...)
+  __attribute__ ((__format__ (__printf__, 1, 2)));
+extern int xfprintf (FILE *restrict stream, char const *restrict format, ...)
+  __attribute__ ((__format__ (__printf__, 2, 3)));
+
+#endif
diff --git a/modules/xprintf b/modules/xprintf
new file mode 100644
index 0000000000..6459f233f8
--- /dev/null
+++ b/modules/xprintf
@@ -0,0 +1,27 @@
+Description:
+a wrapper around printf that calls error upon ENOMEM or EILSEQ errors
+
+Files:
+lib/xprintf.h
+lib/xprintf.c
+
+Depends-on:
+error
+exitfail
+gettext-h
+stdarg
+stdio
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xprintf.h xprintf.c
+
+Include:
+"xprintf.h"
+
+License:
+LGPL
+
+Maintainer:
+Jim Meyering