annotate lib/error.c @ 17718:cc408fc7021c

Sync up error.c with glibc This is a partial sync-up of error.c with glibc. The following changes went in: - Get rid of the INTUSE macro - Remove unused macro ALLOCA_LIMIT - Fix a potential buffer overflow in error_tail (sourceware bz #15672) - Fix a potential NULL dereference in strcmp error: Sync from glibc master * lib/error.c [_LIBC]: Remove INTUSE usage. (error_tail): Remove unused macro ALLOCA_LIMIT. Fix potential buffer overflow. Fix potential NULL dereference in strcmp.
author Siddhesh Poyarekar <siddhesh@redhat.com>
date Wed, 09 Jul 2014 15:26:17 +0530
parents 344018b6e5d7
children 41c703805963
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
1 /* Error handler for noninteractive utilities
17587
344018b6e5d7 maint: update copyright
Eric Blake <eblake@redhat.com>
parents: 17531
diff changeset
2 Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc.
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
3 This file is part of the GNU C Library.
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
4
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9112
diff changeset
5 This program is free software: you can redistribute it and/or modify
4020
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
6 it under the terms of the GNU General Public License as published by
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9112
diff changeset
7 the Free Software Foundation; either version 3 of the License, or
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9112
diff changeset
8 (at your option) any later version.
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
9
4020
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
10 This program is distributed in the hope that it will be useful,
724
3f555c6de1b9 Use #if, not #ifdef in test for HAVE_CONFIG_H.
Jim Meyering <jim@meyering.net>
parents: 719
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
4020
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
13 GNU General Public License for more details.
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
14
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9112
diff changeset
15 You should have received a copy of the GNU General Public License
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 9112
diff changeset
16 along with this program. If not, see <http://www.gnu.org/licenses/>. */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
17
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
18 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
19
7302
8a1a9361108c * _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents: 7232
diff changeset
20 #if !_LIBC
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
21 # include <config.h>
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
22 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
23
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
24 #include "error.h"
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
25
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
26 #include <stdarg.h>
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
27 #include <stdio.h>
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
28 #include <stdlib.h>
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
29 #include <string.h>
3966
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
30
5562
2479d10c3961 [!_LIBC && !ENABLE_NLS]: Do not include "gettext.h";
Paul Eggert <eggert@cs.ucla.edu>
parents: 5319
diff changeset
31 #if !_LIBC && ENABLE_NLS
3966
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
32 # include "gettext.h"
9112
8b2acf250f22 Add missing definition of _ macro.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
33 # define _(msgid) gettext (msgid)
2984
5b1fa2113060 Add a couple #includes, merging from GNU libc version.
Jim Meyering <jim@meyering.net>
parents: 2643
diff changeset
34 #endif
3966
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
35
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
36 #ifdef _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
37 # include <libintl.h>
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
38 # include <stdbool.h>
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
39 # include <stdint.h>
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
40 # include <wchar.h>
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
41 # define mbsrtowcs __mbsrtowcs
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
42 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
43
5319
61af141e6032 error.c, md5.c, regex.c: Use '#if USE_UNLOCKED_IO' instead of
Simon Josefsson <simon@josefsson.org>
parents: 5318
diff changeset
44 #if USE_UNLOCKED_IO
4070
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
45 # include "unlocked-io.h"
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
46 #endif
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
47
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
48 #ifndef _
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
49 # define _(String) String
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
50 #endif
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
51
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
52 /* If NULL, error will flush stdout, then print on stderr the program
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
53 name, a colon and a space. Otherwise, error will call this
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
54 function without parameters instead. */
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
55 void (*error_print_progname) (void);
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
56
16235
18a38c9615f0 In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents: 16214
diff changeset
57 /* This variable is incremented each time 'error' is called. */
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
58 unsigned int error_message_count;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
59
527
c6cca2ddbf8d new version from FSF
Jim Meyering <jim@meyering.net>
parents: 482
diff changeset
60 #ifdef _LIBC
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
61 /* In the GNU C library, there is a predefined variable for this. */
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
62
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
63 # define program_name program_invocation_name
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
64 # include <errno.h>
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
65 # include <limits.h>
4070
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
66 # include <libio/libioP.h>
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
67
16235
18a38c9615f0 In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents: 16214
diff changeset
68 /* In GNU libc we want do not want to use the common name 'error' directly.
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
69 Instead make it a weak alias. */
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
70 extern void __error (int status, int errnum, const char *message, ...)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
71 __attribute__ ((__format__ (__printf__, 3, 4)));
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
72 extern void __error_at_line (int status, int errnum, const char *file_name,
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
73 unsigned int line_number, const char *message,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
74 ...)
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
75 __attribute__ ((__format__ (__printf__, 5, 6)));;
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
76 # define error __error
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
77 # define error_at_line __error_at_line
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
78
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
79 # include <libio/iolibio.h>
17718
cc408fc7021c Sync up error.c with glibc
Siddhesh Poyarekar <siddhesh@redhat.com>
parents: 17587
diff changeset
80 # define fflush(s) _IO_fflush (s)
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
81 # undef putc
17718
cc408fc7021c Sync up error.c with glibc
Siddhesh Poyarekar <siddhesh@redhat.com>
parents: 17587
diff changeset
82 # define putc(c, fp) _IO_putc (c, fp)
2984
5b1fa2113060 Add a couple #includes, merging from GNU libc version.
Jim Meyering <jim@meyering.net>
parents: 2643
diff changeset
83
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
84 # include <bits/libc-lock.h>
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
85
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
86 #else /* not _LIBC */
527
c6cca2ddbf8d new version from FSF
Jim Meyering <jim@meyering.net>
parents: 482
diff changeset
87
11713
2b42a598bba2 error: avoid undefined use of stdout
Eric Blake <ebb9@byu.net>
parents: 9309
diff changeset
88 # include <fcntl.h>
12338
6d35e757e103 Oops, move the include of unistd.h in the last commit.
Bruno Haible <bruno@clisp.org>
parents: 12337
diff changeset
89 # include <unistd.h>
11713
2b42a598bba2 error: avoid undefined use of stdout
Eric Blake <ebb9@byu.net>
parents: 9309
diff changeset
90
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
91 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
16214
ec738d6aeef5 Talk about "native Windows API", not "Win32".
Bruno Haible <bruno@clisp.org>
parents: 16201
diff changeset
92 /* Get declarations of the native Windows API functions. */
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
93 # define WIN32_LEAN_AND_MEAN
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
94 # include <windows.h>
15752
b86e9061a6d0 New module 'msvc-nothrow'. Makes _get_osfhandle safe on MSVC 9.
Bruno Haible <bruno@clisp.org>
parents: 14868
diff changeset
95 /* Get _get_osfhandle. */
b86e9061a6d0 New module 'msvc-nothrow'. Makes _get_osfhandle safe on MSVC 9.
Bruno Haible <bruno@clisp.org>
parents: 14868
diff changeset
96 # include "msvc-nothrow.h"
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
97 # endif
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
98
13326
9a066ce4a8a5 error: Use system's fcntl function.
Bruno Haible <bruno@clisp.org>
parents: 13324
diff changeset
99 /* The gnulib override of fcntl is not needed in this file. */
9a066ce4a8a5 error: Use system's fcntl function.
Bruno Haible <bruno@clisp.org>
parents: 13324
diff changeset
100 # undef fcntl
9a066ce4a8a5 error: Use system's fcntl function.
Bruno Haible <bruno@clisp.org>
parents: 13324
diff changeset
101
14868
3b0e2e72c0a2 error: Avoid gcc warning.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
102 # if !HAVE_DECL_STRERROR_R
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
103 # ifndef HAVE_DECL_STRERROR_R
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
104 "this configure-time declaration test was not run"
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
105 # endif
14868
3b0e2e72c0a2 error: Avoid gcc warning.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
106 # if STRERROR_R_CHAR_P
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
107 char *strerror_r ();
14868
3b0e2e72c0a2 error: Avoid gcc warning.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
108 # else
3b0e2e72c0a2 error: Avoid gcc warning.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
109 int strerror_r ();
3b0e2e72c0a2 error: Avoid gcc warning.
Bruno Haible <bruno@clisp.org>
parents: 14079
diff changeset
110 # endif
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
111 # endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
112
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
113 /* The calling program should define program_name and set it to the
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
114 name of the executing program. */
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
115 extern char *program_name;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
116
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
117 # if HAVE_STRERROR_R || defined strerror_r
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
118 # define __strerror_r strerror_r
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
119 # endif /* HAVE_STRERROR_R || defined strerror_r */
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
120 #endif /* not _LIBC */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
121
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
122 #if !_LIBC
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
123 /* Return non-zero if FD is open. */
17186
84256646069c error, filevercmp: no 'static inline'
Paul Eggert <eggert@cs.ucla.edu>
parents: 16235
diff changeset
124 static int
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
125 is_open (int fd)
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
126 {
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
127 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
16214
ec738d6aeef5 Talk about "native Windows API", not "Win32".
Bruno Haible <bruno@clisp.org>
parents: 16201
diff changeset
128 /* On native Windows: The initial state of unassigned standard file
ec738d6aeef5 Talk about "native Windows API", not "Win32".
Bruno Haible <bruno@clisp.org>
parents: 16201
diff changeset
129 descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
ec738d6aeef5 Talk about "native Windows API", not "Win32".
Bruno Haible <bruno@clisp.org>
parents: 16201
diff changeset
130 There is no fcntl, and the gnulib replacement fcntl does not support
ec738d6aeef5 Talk about "native Windows API", not "Win32".
Bruno Haible <bruno@clisp.org>
parents: 16201
diff changeset
131 F_GETFL. */
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
132 return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
133 # else
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
134 # ifndef F_GETFL
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
135 # error Please port fcntl to your platform
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
136 # endif
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
137 return 0 <= fcntl (fd, F_GETFL);
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
138 # endif
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
139 }
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
140 #endif
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
141
17186
84256646069c error, filevercmp: no 'static inline'
Paul Eggert <eggert@cs.ucla.edu>
parents: 16235
diff changeset
142 static void
12337
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
143 flush_stdout (void)
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
144 {
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
145 #if !_LIBC
12337
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
146 int stdout_fd;
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
147
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
148 # if GNULIB_FREOPEN_SAFER
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
149 /* Use of gnulib's freopen-safer module normally ensures that
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
150 fileno (stdout) == 1
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
151 whenever stdout is open. */
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
152 stdout_fd = STDOUT_FILENO;
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
153 # else
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
154 /* POSIX states that fileno (stdout) after fclose is unspecified. But in
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
155 practice it is not a problem, because stdout is statically allocated and
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
156 the fd of a FILE stream is stored as a field in its allocated memory. */
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
157 stdout_fd = fileno (stdout);
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
158 # endif
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
159 /* POSIX states that fflush (stdout) after fclose is unspecified; it
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
160 is safe in glibc, but not on all other platforms. fflush (NULL)
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
161 is always defined, but too draconian. */
13324
2792eeac632f error: More reliable output on mingw.
Bruno Haible <bruno@clisp.org>
parents: 12559
diff changeset
162 if (0 <= stdout_fd && is_open (stdout_fd))
12337
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
163 #endif
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
164 fflush (stdout);
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
165 }
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
166
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
167 static void
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
168 print_errno_message (int errnum)
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
169 {
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
170 char const *s;
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
171
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
172 #if defined HAVE_STRERROR_R || _LIBC
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
173 char errbuf[1024];
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
174 # if STRERROR_R_CHAR_P || _LIBC
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
175 s = __strerror_r (errnum, errbuf, sizeof errbuf);
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
176 # else
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
177 if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
178 s = errbuf;
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
179 else
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
180 s = 0;
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
181 # endif
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
182 #else
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
183 s = strerror (errnum);
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
184 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
185
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
186 #if !_LIBC
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
187 if (! s)
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
188 s = _("Unknown system error");
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
189 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
190
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
191 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
192 __fxprintf (NULL, ": %s", s);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
193 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
194 fprintf (stderr, ": %s", s);
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
195 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
196 }
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
197
17531
e4bb7b0088bb error: add the printf attribute to a static function
Jim Meyering <meyering@fb.com>
parents: 17249
diff changeset
198 static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
199 error_tail (int status, int errnum, const char *message, va_list args)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
200 {
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
201 #if _LIBC
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
202 if (_IO_fwide (stderr, 0) > 0)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
203 {
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
204 size_t len = strlen (message) + 1;
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
205 wchar_t *wmessage = NULL;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
206 mbstate_t st;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
207 size_t res;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
208 const char *tmp;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
209 bool use_malloc = false;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
210
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
211 while (1)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
212 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
213 if (__libc_use_alloca (len * sizeof (wchar_t)))
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
214 wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
215 else
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
216 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
217 if (!use_malloc)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
218 wmessage = NULL;
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
219
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
220 wchar_t *p = (wchar_t *) realloc (wmessage,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
221 len * sizeof (wchar_t));
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
222 if (p == NULL)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
223 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
224 free (wmessage);
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
225 fputws_unlocked (L"out of memory\n", stderr);
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
226 return;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
227 }
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
228 wmessage = p;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
229 use_malloc = true;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
230 }
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
231
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
232 memset (&st, '\0', sizeof (st));
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
233 tmp = message;
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
234
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
235 res = mbsrtowcs (wmessage, &tmp, len, &st);
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
236 if (res != len)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
237 break;
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
238
17718
cc408fc7021c Sync up error.c with glibc
Siddhesh Poyarekar <siddhesh@redhat.com>
parents: 17587
diff changeset
239 if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
240 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
241 /* This really should not happen if everything is fine. */
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
242 res = (size_t) -1;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
243 break;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
244 }
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
245
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
246 len *= 2;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
247 }
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
248
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
249 if (res == (size_t) -1)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
250 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
251 /* The string cannot be converted. */
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
252 if (use_malloc)
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
253 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
254 free (wmessage);
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
255 use_malloc = false;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
256 }
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
257 wmessage = (wchar_t *) L"???";
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
258 }
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
259
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
260 __vfwprintf (stderr, wmessage, args);
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
261
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
262 if (use_malloc)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
263 free (wmessage);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
264 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
265 else
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
266 #endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
267 vfprintf (stderr, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
268 va_end (args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
269
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
270 ++error_message_count;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
271 if (errnum)
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
272 print_errno_message (errnum);
4680
0ec32cb1202f Correct indentation of cpp directives.
Jim Meyering <jim@meyering.net>
parents: 4636
diff changeset
273 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
274 __fxprintf (NULL, "\n");
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
275 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
276 putc ('\n', stderr);
4680
0ec32cb1202f Correct indentation of cpp directives.
Jim Meyering <jim@meyering.net>
parents: 4636
diff changeset
277 #endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
278 fflush (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
279 if (status)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
280 exit (status);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
281 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
282
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
283
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
284 /* Print the program name and error message MESSAGE, which is a printf-style
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
285 format string with optional args.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
286 If ERRNUM is nonzero, print its corresponding system error message.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
287 Exit with status STATUS if it is nonzero. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
288 void
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
289 error (int status, int errnum, const char *message, ...)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
290 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
291 va_list args;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
292
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
293 #if defined _LIBC && defined __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
294 /* We do not want this call to be cut short by a thread
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
295 cancellation. Therefore disable cancellation for now. */
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
296 int state = PTHREAD_CANCEL_ENABLE;
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
297 __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
298 0);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
299 #endif
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
300
12337
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
301 flush_stdout ();
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
302 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
303 _IO_flockfile (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
304 #endif
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
305 if (error_print_progname)
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
306 (*error_print_progname) ();
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
307 else
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
308 {
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
309 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
310 __fxprintf (NULL, "%s: ", program_name);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
311 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
312 fprintf (stderr, "%s: ", program_name);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
313 #endif
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
314 }
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
315
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
316 va_start (args, message);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
317 error_tail (status, errnum, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
318
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
319 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
320 _IO_funlockfile (stderr);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
321 # ifdef __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
322 __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
323 # endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
324 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
325 }
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
326
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
327 /* Sometimes we want to have at most one error per line. This
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
328 variable controls whether this mode is selected or not. */
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
329 int error_one_per_line;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
330
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
331 void
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
332 error_at_line (int status, int errnum, const char *file_name,
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
333 unsigned int line_number, const char *message, ...)
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
334 {
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
335 va_list args;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
336
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
337 if (error_one_per_line)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
338 {
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
339 static const char *old_file_name;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
340 static unsigned int old_line_number;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
341
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
342 if (old_line_number == line_number
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
343 && (file_name == old_file_name
17718
cc408fc7021c Sync up error.c with glibc
Siddhesh Poyarekar <siddhesh@redhat.com>
parents: 17587
diff changeset
344 || (old_file_name != NULL
cc408fc7021c Sync up error.c with glibc
Siddhesh Poyarekar <siddhesh@redhat.com>
parents: 17587
diff changeset
345 && file_name != NULL
cc408fc7021c Sync up error.c with glibc
Siddhesh Poyarekar <siddhesh@redhat.com>
parents: 17587
diff changeset
346 && strcmp (old_file_name, file_name) == 0)))
cc408fc7021c Sync up error.c with glibc
Siddhesh Poyarekar <siddhesh@redhat.com>
parents: 17587
diff changeset
347
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
348 /* Simply return and print nothing. */
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
349 return;
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
350
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
351 old_file_name = file_name;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
352 old_line_number = line_number;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
353 }
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
354
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
355 #if defined _LIBC && defined __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
356 /* We do not want this call to be cut short by a thread
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
357 cancellation. Therefore disable cancellation for now. */
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
358 int state = PTHREAD_CANCEL_ENABLE;
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
359 __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
360 0);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
361 #endif
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
362
12337
9d131fdf3903 error: account for the possibility of freopen (stdout).
Bruno Haible <bruno@clisp.org>
parents: 11714
diff changeset
363 flush_stdout ();
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
364 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
365 _IO_flockfile (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
366 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
367 if (error_print_progname)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
368 (*error_print_progname) ();
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
369 else
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
370 {
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
371 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
372 __fxprintf (NULL, "%s:", program_name);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
373 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
374 fprintf (stderr, "%s:", program_name);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
375 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
376 }
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
377
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
378 #if _LIBC
7131
02e62250d524 * misc/error.c: Add space between program name and message if file
Eric Blake <ebb9@byu.net>
parents: 7088
diff changeset
379 __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ",
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
380 file_name, line_number);
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
381 #else
7131
02e62250d524 * misc/error.c: Add space between program name and message if file
Eric Blake <ebb9@byu.net>
parents: 7088
diff changeset
382 fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 12338
diff changeset
383 file_name, line_number);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
384 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
385
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
386 va_start (args, message);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
387 error_tail (status, errnum, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
388
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
389 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
390 _IO_funlockfile (stderr);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
391 # ifdef __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
392 __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
393 # endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
394 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
395 }
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
396
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
397 #ifdef _LIBC
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
398 /* Make the weak alias. */
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
399 # undef error
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
400 # undef error_at_line
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
401 weak_alias (__error, error)
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
402 weak_alias (__error_at_line, error_at_line)
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
403 #endif