Mercurial > hg > octave-nkf > gnulib-hg

annotate lib/error.c @ 4739:04758f7475fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from glibc.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 26 Sep 2003 07:35:01 +0000
parents 4cd5b2420ecf
children 892879324c9c
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
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
2 Copyright (C) 1990-1998, 2000-2002, 2003 Free Software Foundation, Inc.
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,
7158a1db8695 change license to gpl.
Karl Berry <karl@freefriends.org>
parents: 4009
diff changeset
17 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
32 #ifdef _LIBC
2984
5b1fa2113060 Add a couple #includes, merging from GNU libc version.
Jim Meyering <jim@meyering.net>
parents: 2643
diff changeset
33 # include <libintl.h>
3966
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
34 #else
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
35 # include "gettext.h"
2984
5b1fa2113060 Add a couple #includes, merging from GNU libc version.
Jim Meyering <jim@meyering.net>
parents: 2643
diff changeset
36 #endif
3966
22d3032f0239 Include gettext.h instead of <libintl.h> with #ifdefs.
Bruno Haible <bruno@clisp.org>
parents: 3618
diff changeset
37
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
38 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
39 # include <wchar.h>
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
40 # define mbsrtowcs __mbsrtowcs
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
41 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
42
4072
86ee34b1ec28 Be consistent: change `#ifndef _LIBC' to `#if !_LIBC'.
Jim Meyering <jim@meyering.net>
parents: 4070
diff changeset
43 #if !_LIBC
4070
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
44 # 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
45 #endif
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
46
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
47 #ifndef _
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
48 # define _(String) String
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
49 #endif
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
50
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
51 /* If NULL, error will flush stdout, then print on stderr the program
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
52 name, a colon and a space. Otherwise, error will call this
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
53 function without parameters instead. */
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
54 void (*error_print_progname) (void);
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
55
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
56 /* This variable is incremented each time `error' is called. */
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
57 unsigned int error_message_count;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
58
527
c6cca2ddbf8d new version from FSF
Jim Meyering <jim@meyering.net>
parents: 482
diff changeset
59 #ifdef _LIBC
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
60 /* 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
61
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
62 # define program_name program_invocation_name
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
63 # include <errno.h>
4070
925594d77a99 Merge in changes from libc's misc/error.c, in preparation
Jim Meyering <jim@meyering.net>
parents: 4020
diff changeset
64 # include <libio/libioP.h>
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
65
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
66 /* 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
67 Instead make it a weak alias. */
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
68 extern void __error (int status, int errnum, const char *message, ...)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
69 __attribute__ ((__format__ (__printf__, 3, 4)));
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
70 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
71 unsigned int line_number, const char *message,
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
72 ...)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
73 __attribute__ ((__format__ (__printf__, 5, 6)));;
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
74 # define error __error
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
75 # define error_at_line __error_at_line
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
76
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
77 # 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
78 # 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
79 # 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
80 # 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
81
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
82 # include <bits/libc-lock.h>
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
83
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
84 #else /* not _LIBC */
527
c6cca2ddbf8d new version from FSF
Jim Meyering <jim@meyering.net>
parents: 482
diff changeset
85
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
86 # 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
87 # ifndef HAVE_DECL_STRERROR_R
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
88 "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
89 # endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
90 char *strerror_r ();
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
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
93 /* The calling program should define program_name and set it to the
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
94 name of the executing program. */
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
95 extern char *program_name;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
96
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
97 # if HAVE_STRERROR_R || defined strerror_r
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
98 # define __strerror_r strerror_r
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
99 # endif
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
100 #endif /* not _LIBC */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
101
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
102 static void
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
103 print_errno_message (int errnum)
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
104 {
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
105 char const *s;
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
106
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
107 #if defined HAVE_STRERROR_R || _LIBC
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
108 char errbuf[1024];
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
109 # if STRERROR_R_CHAR_P || _LIBC
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
110 s = __strerror_r (errnum, errbuf, sizeof errbuf);
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
111 # else
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
112 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
113 s = errbuf;
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
114 else
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
115 s = 0;
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
116 # endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
117 #else
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
118 s = strerror (errnum);
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
119 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
120
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
121 #if !_LIBC
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
122 if (! s)
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
123 s = _("Unknown system error");
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
124 #endif
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
125
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
126 #if _LIBC
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
127 if (_IO_fwide (stderr, 0) > 0)
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
128 {
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
129 __fwprintf (stderr, L": %s", s);
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
130 return;
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
131 }
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
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
134 fprintf (stderr, ": %s", s);
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
135 }
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
136
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
137 static void
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
138 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
139 {
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
140 #if _LIBC
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
141 if (_IO_fwide (stderr, 0) > 0)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
142 {
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
143 # define ALLOCA_LIMIT 2000
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
144 size_t len = strlen (message) + 1;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
145 wchar_t *wmessage = NULL;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
146 mbstate_t st;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
147 size_t res;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
148 const char *tmp;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
149
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
150 do
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
151 {
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
152 if (len < ALLOCA_LIMIT)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
153 wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
154 else
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
155 {
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
156 if (wmessage != NULL && len / 2 < ALLOCA_LIMIT)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
157 wmessage = NULL;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
158
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
159 wmessage = (wchar_t *) realloc (wmessage,
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
160 len * sizeof (wchar_t));
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
161
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
162 if (wmessage == NULL)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
163 {
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
164 fputws_unlocked (L"out of memory\n", stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
165 return;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
166 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
167 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
168
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
169 memset (&st, '\0', sizeof (st));
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
170 tmp =message;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
171 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
172 while ((res = mbsrtowcs (wmessage, &tmp, len, &st)) == len);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
173
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
174 if (res == (size_t) -1)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
175 /* The string cannot be converted. */
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
176 wmessage = (wchar_t *) L"???";
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
177
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
178 __vfwprintf (stderr, wmessage, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
179 }
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
180 else
4695
4cd5b2420ecf Assume vprintf.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4680
diff changeset
181 #endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
182 vfprintf (stderr, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
183 va_end (args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
184
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
185 ++error_message_count;
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
186 if (errnum)
3550
c18604dda2d7 (strerror_r): Do not declare unless !_LIBC.
Jim Meyering <jim@meyering.net>
parents: 3446
diff changeset
187 print_errno_message (errnum);
4680
0ec32cb1202f Correct indentation of cpp directives.
Jim Meyering <jim@meyering.net>
parents: 4636
diff changeset
188 #if _LIBC
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
189 if (_IO_fwide (stderr, 0) > 0)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
190 putwc (L'\n', stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
191 else
4680
0ec32cb1202f Correct indentation of cpp directives.
Jim Meyering <jim@meyering.net>
parents: 4636
diff changeset
192 #endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
193 putc ('\n', stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
194 fflush (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
195 if (status)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
196 exit (status);
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
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
199
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
200 /* Print the program name and error message MESSAGE, which is a printf-style
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
201 format string with optional args.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
202 If ERRNUM is nonzero, print its corresponding system error message.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
203 Exit with status STATUS if it is nonzero. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
204 void
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
205 error (int status, int errnum, const char *message, ...)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
206 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
207 va_list args;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
208
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
209 #if defined _LIBC && defined __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
210 /* 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
211 cancellation. Therefore disable cancellation for now. */
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
212 int state = PTHREAD_CANCEL_ENABLE;
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
213 __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
214 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
215 #endif
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
216
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
217 fflush (stdout);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
218 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
219 _IO_flockfile (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
220 #endif
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
221 if (error_print_progname)
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
222 (*error_print_progname) ();
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
223 else
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
224 {
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
225 #if _LIBC
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
226 if (_IO_fwide (stderr, 0) > 0)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
227 __fwprintf (stderr, L"%s: ", program_name);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
228 else
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
229 #endif
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
230 fprintf (stderr, "%s: ", program_name);
398
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
231 }
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
232
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
233 va_start (args, message);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
234 error_tail (status, errnum, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
235
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
236 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
237 _IO_funlockfile (stderr);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
238 # ifdef __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
239 __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
240 # endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
241 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
242 }
572
55f487a8aeab Update from libc.
Jim Meyering <jim@meyering.net>
parents: 527
diff changeset
243
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
244 /* 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
245 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
246 int error_one_per_line;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
247
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
248 void
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
249 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
250 unsigned int line_number, const char *message, ...)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
251 {
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
252 va_list args;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
253
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
254 if (error_one_per_line)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
255 {
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
256 static const char *old_file_name;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
257 static unsigned int old_line_number;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
258
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
259 if (old_line_number == line_number
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
260 && (file_name == old_file_name
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
261 || 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
262 /* Simply return and print nothing. */
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
263 return;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
264
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
265 old_file_name = file_name;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
266 old_line_number = line_number;
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
267 }
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
268
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
269 #if defined _LIBC && defined __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
270 /* 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
271 cancellation. Therefore disable cancellation for now. */
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
272 int state = PTHREAD_CANCEL_ENABLE;
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
273 __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
274 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
275 #endif
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
276
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
277 fflush (stdout);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
278 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
279 _IO_flockfile (stderr);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
280 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
281 if (error_print_progname)
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
282 (*error_print_progname) ();
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
283 else
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
284 {
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
285 #if _LIBC
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
286 if (_IO_fwide (stderr, 0) > 0)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
287 __fwprintf (stderr, L"%s: ", program_name);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
288 else
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
289 #endif
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
290 fprintf (stderr, "%s:", program_name);
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
291 }
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
292
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
293 if (file_name != NULL)
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
294 {
4500
cdb224406ea7 [!USE_IN_LIBIO]: Omit this case; assume USE_IN_LIBIO is 1.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4072
diff changeset
295 #if _LIBC
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
296 if (_IO_fwide (stderr, 0) > 0)
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
297 __fwprintf (stderr, L"%s:%d: ", file_name, line_number);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
298 else
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
299 #endif
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
300 fprintf (stderr, "%s:%d: ", file_name, line_number);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
301 }
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
302
4636
8b869710f671 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4500
diff changeset
303 va_start (args, message);
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
304 error_tail (status, errnum, message, args);
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
305
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
306 #ifdef _LIBC
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
307 _IO_funlockfile (stderr);
4739
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
308 # ifdef __libc_ptf_call
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
309 __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
04758f7475fd Merge changes from glibc.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4695
diff changeset
310 # endif
3446
849a40d65bee Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 2984
diff changeset
311 #endif
573
8a90f3b04017 update from FSF:/home/gd/gnu/lib
Jim Meyering <jim@meyering.net>
parents: 572
diff changeset
312 }
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
313
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
314 #ifdef _LIBC
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
315 /* Make the weak alias. */
1289
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
316 # undef error
8b40e286a0bd new version from Uli
Jim Meyering <jim@meyering.net>
parents: 1268
diff changeset
317 # undef error_at_line
1268
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
318 weak_alias (__error, error)
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
319 weak_alias (__error_at_line, error_at_line)
a6946b537568 update from fsf
Jim Meyering <jim@meyering.net>
parents: 882
diff changeset
320 #endif