projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New upstream version 1.9
[debian/gzip]
/
lib
/
error.c
diff --git
a/lib/error.c
b/lib/error.c
index 56ac889aa5457d71935d8087614c3f0739f0e052..81788c7b96e7e35b3b8815721b80867c2526156d 100644
(file)
--- a/
lib/error.c
+++ b/
lib/error.c
@@
-1,5
+1,5
@@
/* Error handler for noninteractive utilities
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2007, 2009-201
6
Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000-2007, 2009-201
8
Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@
-13,7
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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/>. */
+ along with this program. If not, see <http
s
://www.gnu.org/licenses/>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
@@
-42,6
+42,8
@@
# define USE_UNLOCKED_IO 0
# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
# define _GL_ARG_NONNULL(a)
# define USE_UNLOCKED_IO 0
# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
# define _GL_ARG_NONNULL(a)
+#else
+# include "getprogname.h"
#endif
#if USE_UNLOCKED_IO
#endif
#if USE_UNLOCKED_IO
@@
-96,30
+98,32
@@
extern void __error_at_line (int status, int errnum, const char *file_name,
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
/* Get _get_osfhandle. */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
/* Get _get_osfhandle. */
-# include "msvc-nothrow.h"
+# if GNULIB_MSVC_NOTHROW
+# include "msvc-nothrow.h"
+# else
+# include <io.h>
+# endif
# endif
/* The gnulib override of fcntl is not needed in this file. */
# undef fcntl
# endif
/* The gnulib override of fcntl is not needed in this file. */
# undef fcntl
-# if !
HAVE_DECL_STRERROR_R
+# if !
(GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R)
# ifndef HAVE_DECL_STRERROR_R
"this configure-time declaration test was not run"
# endif
# if STRERROR_R_CHAR_P
# ifndef HAVE_DECL_STRERROR_R
"this configure-time declaration test was not run"
# endif
# if STRERROR_R_CHAR_P
-char *strerror_r ();
+char *strerror_r (
int errnum, char *buf, size_t buflen
);
# else
# else
-int strerror_r ();
+int strerror_r (
int errnum, char *buf, size_t buflen
);
# endif
# endif
# endif
# endif
-/* The calling program should define program_name and set it to the
- name of the executing program. */
-extern char *program_name;
+#define program_name getprogname ()
-# if HAVE_STRERROR_R || defined strerror_r
+# if
GNULIB_STRERROR_R_POSIX ||
HAVE_STRERROR_R || defined strerror_r
# define __strerror_r strerror_r
# define __strerror_r strerror_r
-# endif /* HAVE_STRERROR_R || defined strerror_r */
+# endif /*
GNULIB_STRERROR_R_POSIX ||
HAVE_STRERROR_R || defined strerror_r */
#endif /* not _LIBC */
#if !_LIBC
#endif /* not _LIBC */
#if !_LIBC
@@
-172,9
+176,9
@@
print_errno_message (int errnum)
{
char const *s;
{
char const *s;
-#if
defined HAVE_STRERROR_R || _LIBC
+#if
_LIBC || GNULIB_STRERROR_R_POSIX || defined HAVE_STRERROR_R
char errbuf[1024];
char errbuf[1024];
-# if _LIBC ||
STRERROR_R_CHAR_P
+# if _LIBC ||
(!GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P)
s = __strerror_r (errnum, errbuf, sizeof errbuf);
# else
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
s = __strerror_r (errnum, errbuf, sizeof errbuf);
# else
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
@@
-268,7
+272,6
@@
error_tail (int status, int errnum, const char *message, va_list args)
else
#endif
vfprintf (stderr, message, args);
else
#endif
vfprintf (stderr, message, args);
- va_end (args);
++error_message_count;
if (errnum)
++error_message_count;
if (errnum)
@@
-318,6
+321,7
@@
error (int status, int errnum, const char *message, ...)
va_start (args, message);
error_tail (status, errnum, message, args);
va_start (args, message);
error_tail (status, errnum, message, args);
+ va_end (args);
#ifdef _LIBC
_IO_funlockfile (stderr);
#ifdef _LIBC
_IO_funlockfile (stderr);
@@
-388,6
+392,7
@@
error_at_line (int status, int errnum, const char *file_name,
va_start (args, message);
error_tail (status, errnum, message, args);
va_start (args, message);
error_tail (status, errnum, message, args);
+ va_end (args);
#ifdef _LIBC
_IO_funlockfile (stderr);
#ifdef _LIBC
_IO_funlockfile (stderr);