Mercurial > hg > octave-nkf > gnulib-hg

annotate lib/error.c @ 7292:17785d5bede0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix docstrings
author Sergey Poznyakoff <gray@gnu.org.ua>
date Sun, 10 Sep 2006 11:52:44 +0000
parents b307709e3a05
children 8a1a9361108c
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
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
2 Copyright (C) 1990-1998, 2000-2005, 2006 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
4020
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
5 This program is free software; you can redistribute it and/or modify
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
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
7 the Free Software Foundation; either version 2, or (at your option)
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
8 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
4020
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
15 You should have received a copy of the GNU General Public License along
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
16 with this program; if not, write to the Free Software Foundation,
5848
a48fb0e98c8c *** empty log message ***
Paul Eggert <eggert@cs.ucla.edu>
parents: 5562
diff changeset
17 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
18
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
19 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
20
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
21 #ifdef HAVE_CONFIG_H
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
22 # include <config.h>
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
23 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
24
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
25 #include "error.h"
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
26
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
27 #include <stdarg.h>
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
28 #include <stdio.h>
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
29 #include <stdlib.h>
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
30 #include <string.h>
3966
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
31
5562
2479d10c3961 [!_LIBC && !ENABLE_NLS]: Do not include "gettext.h";
Paul Eggert <eggert@cs.ucla.edu>
parents: 5319
diff changeset
32 #if !_LIBC && ENABLE_NLS
3966
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
33 # include "gettext.h"
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
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
57 /* This variable is incremented each time `error' is called. */
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
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
68 /* In GNU libc we want do not want to use the common name `error' directly.
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,
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
73 unsigned int line_number, const char *message,
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
74 ...)
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>
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
80 # define fflush(s) INTUSE(_IO_fflush) (s)
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
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
82 # define putc(c, fp) INTUSE(_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
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
88 # if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
89 # ifndef HAVE_DECL_STRERROR_R
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
90 "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
91 # endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
92 char *strerror_r ();
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
93 # endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
94
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
95 /* The calling program should define program_name and set it to the
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
96 name of the executing program. */
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
97 extern char *program_name;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
98
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
99 # if HAVE_STRERROR_R || defined strerror_r
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
100 # define __strerror_r strerror_r
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
101 # endif /* HAVE_STRERROR_R || defined strerror_r */
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
102 #endif /* not _LIBC */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
103
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
104 static void
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
105 print_errno_message (int errnum)
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
106 {
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
107 char const *s;
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
108
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
109 #if defined HAVE_STRERROR_R || _LIBC
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
110 char errbuf[1024];
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
111 # if STRERROR_R_CHAR_P || _LIBC
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
112 s = __strerror_r (errnum, errbuf, sizeof errbuf);
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
113 # else
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
114 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
115 s = errbuf;
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
116 else
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
117 s = 0;
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
118 # endif
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
119 #else
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
120 s = strerror (errnum);
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
121 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
122
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
123 #if !_LIBC
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
124 if (! s)
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
125 s = _("Unknown system error");
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
126 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
127
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
128 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
129 __fxprintf (NULL, ": %s", s);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
130 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
131 fprintf (stderr, ": %s", s);
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
132 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
133 }
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
134
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
135 static void
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
136 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
137 {
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
138 #if _LIBC
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
139 if (_IO_fwide (stderr, 0) > 0)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
140 {
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
141 # define ALLOCA_LIMIT 2000
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
142 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
143 wchar_t *wmessage = NULL;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
144 mbstate_t st;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
145 size_t res;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
146 const char *tmp;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
147 bool use_malloc = false;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
148
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
149 while (1)
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
150 {
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
151 if (__libc_use_alloca (len * sizeof (wchar_t)))
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
152 wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
153 else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
154 {
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
155 if (!use_malloc)
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
156 wmessage = NULL;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
157
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
158 wchar_t *p = (wchar_t *) realloc (wmessage,
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
159 len * sizeof (wchar_t));
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
160 if (p == NULL)
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
161 {
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
162 free (wmessage);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
163 fputws_unlocked (L"out of memory\n", stderr);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
164 return;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
165 }
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
166 wmessage = p;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
167 use_malloc = true;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
168 }
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
169
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
170 memset (&st, '\0', sizeof (st));
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
171 tmp = message;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
172
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
173 res = mbsrtowcs (wmessage, &tmp, len, &st);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
174 if (res != len)
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
175 break;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
176
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
177 if (__builtin_expect (len >= SIZE_MAX / 2, 0))
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
178 {
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
179 /* This really should not happen if everything is fine. */
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
180 res = (size_t) -1;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
181 break;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
182 }
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
183
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
184 len *= 2;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
185 }
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
186
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
187 if (res == (size_t) -1)
4740
892879324c9c (SIZE_MAX) [!defined SIZE_MAX]: Define.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4739
diff changeset
188 {
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
189 /* The string cannot be converted. */
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
190 if (use_malloc)
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
191 {
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
192 free (wmessage);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
193 use_malloc = false;
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
194 }
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
195 wmessage = (wchar_t *) L"???";
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
196 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
197
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
198 __vfwprintf (stderr, wmessage, args);
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
199
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
200 if (use_malloc)
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
201 free (wmessage);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
202 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
203 else
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
204 #endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
205 vfprintf (stderr, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
206 va_end (args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
207
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
208 ++error_message_count;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
209 if (errnum)
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
210 print_errno_message (errnum);
4680
0ec32cb1202f Correct indentation of cpp directives.
Jim Meyering <jim@meyering.net>
parents: 4636
diff changeset
211 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
212 __fxprintf (NULL, "\n");
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
213 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
214 putc ('\n', stderr);
4680
0ec32cb1202f Correct indentation of cpp directives.
Jim Meyering <jim@meyering.net>
parents: 4636
diff changeset
215 #endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
216 fflush (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
217 if (status)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
218 exit (status);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
219 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
220
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
221
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
222 /* Print the program name and error message MESSAGE, which is a printf-style
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
223 format string with optional args.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
224 If ERRNUM is nonzero, print its corresponding system error message.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
225 Exit with status STATUS if it is nonzero. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
226 void
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
227 error (int status, int errnum, const char *message, ...)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
228 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
229 va_list args;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
230
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
231 #if defined _LIBC && defined __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
232 /* 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
233 cancellation. Therefore disable cancellation for now. */
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
234 int state = PTHREAD_CANCEL_ENABLE;
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
235 __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
236 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
237 #endif
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
238
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
239 fflush (stdout);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
240 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
241 _IO_flockfile (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
242 #endif
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
243 if (error_print_progname)
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
244 (*error_print_progname) ();
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
245 else
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
246 {
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
247 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
248 __fxprintf (NULL, "%s: ", program_name);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
249 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
250 fprintf (stderr, "%s: ", program_name);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
251 #endif
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
252 }
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
253
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
254 va_start (args, message);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
255 error_tail (status, errnum, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
256
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
257 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
258 _IO_funlockfile (stderr);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
259 # ifdef __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
260 __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
261 # endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
262 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
263 }
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
264
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
265 /* 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
266 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
267 int error_one_per_line;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
268
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
269 void
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
270 error_at_line (int status, int errnum, const char *file_name,
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
271 unsigned int line_number, const char *message, ...)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
272 {
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
273 va_list args;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
274
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
275 if (error_one_per_line)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
276 {
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
277 static const char *old_file_name;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
278 static unsigned int old_line_number;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
279
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
280 if (old_line_number == line_number
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
281 && (file_name == old_file_name
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
282 || strcmp (old_file_name, file_name) == 0))
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
283 /* Simply return and print nothing. */
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
284 return;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
285
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
286 old_file_name = file_name;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
287 old_line_number = line_number;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
288 }
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
289
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
290 #if defined _LIBC && defined __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
291 /* 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
292 cancellation. Therefore disable cancellation for now. */
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
293 int state = PTHREAD_CANCEL_ENABLE;
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
294 __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
295 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
296 #endif
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
297
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
298 fflush (stdout);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
299 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
300 _IO_flockfile (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
301 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
302 if (error_print_progname)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
303 (*error_print_progname) ();
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
304 else
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
305 {
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
306 #if _LIBC
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
307 __fxprintf (NULL, "%s:", program_name);
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
308 #else
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
309 fprintf (stderr, "%s:", program_name);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
310 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
311 }
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
312
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
313 #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
314 __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ",
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
315 file_name, line_number);
7088
e3cb6c0685d8 * error.h: Fold in some upstream changes from glibc.
Eric Blake <ebb9@byu.net>
parents: 5848
diff changeset
316 #else
7131
02e62250d524 * misc/error.c: Add space between program name and message if file
Eric Blake <ebb9@byu.net>
parents: 7088
diff changeset
317 fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",
7232
b307709e3a05 * error.c (error_at_line, print_errno_message): Match libc, after
Eric Blake <ebb9@byu.net>
parents: 7131
diff changeset
318 file_name, line_number);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
319 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
320
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
321 va_start (args, message);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
322 error_tail (status, errnum, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
323
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
324 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
325 _IO_funlockfile (stderr);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
326 # ifdef __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
327 __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
328 # endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
329 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
330 }
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
331
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
332 #ifdef _LIBC
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
333 /* Make the weak alias. */
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
334 # undef error
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
335 # undef error_at_line
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
336 weak_alias (__error, error)
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
337 weak_alias (__error_at_line, error_at_line)
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
338 #endif