[BACK]Return to error.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srclib

Diff for /embedaddon/libiconv/srclib/error.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 09:29:43 version 1.1.1.3, 2021/03/17 13:38:46
Line 1 Line 1
 /* Error handler for noninteractive utilities  /* Error handler for noninteractive utilities
   Copyright (C) 1990-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc.   Copyright (C) 1990-1998, 2000-2007, 2009-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.     This file is part of the GNU C Library.
   
    This program is free software: you can redistribute it and/or modify     This program is free software: you can redistribute it and/or modify
Line 13 Line 13
    GNU General Public License for more details.     GNU General Public License for more details.
   
    You should have received a copy of the GNU General Public License     You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
   
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */  /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
   
Line 39 Line 39
 # include <stdint.h>  # include <stdint.h>
 # include <wchar.h>  # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs  # define mbsrtowcs __mbsrtowcs
   # define USE_UNLOCKED_IO 0
   # define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
   # define _GL_ARG_NONNULL(a)
   #else
   # include "getprogname.h"
 #endif  #endif
   
 #if USE_UNLOCKED_IO  #if USE_UNLOCKED_IO
Line 54 Line 59
    function without parameters instead.  */     function without parameters instead.  */
 void (*error_print_progname) (void);  void (*error_print_progname) (void);
   
/* This variable is incremented each time `error' is called.  *//* This variable is incremented each time 'error' is called.  */
 unsigned int error_message_count;  unsigned int error_message_count;
   
 #ifdef _LIBC  #ifdef _LIBC
Line 65  unsigned int error_message_count; Line 70  unsigned int error_message_count;
 # include <limits.h>  # include <limits.h>
 # include <libio/libioP.h>  # include <libio/libioP.h>
   
/* In GNU libc we want do not want to use the common name `error' directly./* In GNU libc we want do not want to use the common name 'error' directly.
    Instead make it a weak alias.  */     Instead make it a weak alias.  */
 extern void __error (int status, int errnum, const char *message, ...)  extern void __error (int status, int errnum, const char *message, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));       __attribute__ ((__format__ (__printf__, 3, 4)));
 extern void __error_at_line (int status, int errnum, const char *file_name,  extern void __error_at_line (int status, int errnum, const char *file_name,
                              unsigned int line_number, const char *message,                               unsigned int line_number, const char *message,
                              ...)                               ...)
     __attribute__ ((__format__ (__printf__, 5, 6)));;     __attribute__ ((__format__ (__printf__, 5, 6)));
 # define error __error  # define error __error
 # define error_at_line __error_at_line  # define error_at_line __error_at_line
   
 # include <libio/iolibio.h>  # include <libio/iolibio.h>
# define fflush(s) INTUSE(_IO_fflush) (s)# define fflush(s) _IO_fflush (s)
 # undef putc  # undef putc
# define putc(c, fp) INTUSE(_IO_putc) (c, fp)# define putc(c, fp) _IO_putc (c, fp)
   
 # include <bits/libc-lock.h>  # include <bits/libc-lock.h>
   
Line 88  extern void __error_at_line (int status, int errnum, c Line 93  extern void __error_at_line (int status, int errnum, c
 # include <fcntl.h>  # include <fcntl.h>
 # include <unistd.h>  # include <unistd.h>
   
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__# if defined _WIN32 && ! defined __CYGWIN__
/* Get declarations of the Win32 API functions.  *//* Get declarations of the native Windows API functions.  */
 #  define WIN32_LEAN_AND_MEAN  #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>  #  include <windows.h>
   /* Get _get_osfhandle.  */
   #  if GNULIB_MSVC_NOTHROW
   #   include "msvc-nothrow.h"
   #  else
   #   include <io.h>
   #  endif
 # endif  # endif
   
 /* The gnulib override of fcntl is not needed in this file.  */  /* The gnulib override of fcntl is not needed in this file.  */
 # undef fcntl  # undef fcntl
   
# if !HAVE_DECL_STRERROR_R# if !(GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R)
 #  ifndef HAVE_DECL_STRERROR_R  #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"  "this configure-time declaration test was not run"
 #  endif  #  endif
 #  if STRERROR_R_CHAR_P  #  if STRERROR_R_CHAR_P
char *strerror_r ();char *strerror_r (int errnum, char *buf, size_t buflen);
 #  else  #  else
int strerror_r ();int strerror_r (int errnum, char *buf, size_t buflen);
 #  endif  #  endif
 # endif  # endif
   
/* The calling program should define program_name and set it to the#define program_name getprogname ()
   name of the executing program.  */ 
extern char *program_name; 
   
# if HAVE_STRERROR_R || defined strerror_r# if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r  #  define __strerror_r strerror_r
# endif /* HAVE_STRERROR_R || defined strerror_r */# endif /* GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r */
 #endif  /* not _LIBC */  #endif  /* not _LIBC */
   
 #if !_LIBC  #if !_LIBC
 /* Return non-zero if FD is open.  */  /* Return non-zero if FD is open.  */
static inline intstatic int
 is_open (int fd)  is_open (int fd)
 {  {
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__# if defined _WIN32 && ! defined __CYGWIN__
  /* On Win32: The initial state of unassigned standard file descriptors is  /* On native Windows: The initial state of unassigned standard file
     that they are open but point to an INVALID_HANDLE_VALUE.  There is no     descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
     fcntl, and the gnulib replacement fcntl does not support F_GETFL.  */     There is no fcntl, and the gnulib replacement fcntl does not support
      F_GETFL.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;    return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
 # else  # else
 #  ifndef F_GETFL  #  ifndef F_GETFL
Line 136  is_open (int fd) Line 146  is_open (int fd)
 }  }
 #endif  #endif
   
static inline voidstatic void
 flush_stdout (void)  flush_stdout (void)
 {  {
 #if !_LIBC  #if !_LIBC
Line 166  print_errno_message (int errnum) Line 176  print_errno_message (int errnum)
 {  {
   char const *s;    char const *s;
   
#if defined HAVE_STRERROR_R || _LIBC#if _LIBC || GNULIB_STRERROR_R_POSIX || defined HAVE_STRERROR_R
   char errbuf[1024];    char errbuf[1024];
# if STRERROR_R_CHAR_P || _LIBC# if _LIBC || (!GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P)
   s = __strerror_r (errnum, errbuf, sizeof errbuf);    s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # else  # else
   if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)    if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
Line 192  print_errno_message (int errnum) Line 202  print_errno_message (int errnum)
 #endif  #endif
 }  }
   
static voidstatic void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
 error_tail (int status, int errnum, const char *message, va_list args)  error_tail (int status, int errnum, const char *message, va_list args)
 {  {
 #if _LIBC  #if _LIBC
   if (_IO_fwide (stderr, 0) > 0)    if (_IO_fwide (stderr, 0) > 0)
     {      {
 # define ALLOCA_LIMIT 2000  
       size_t len = strlen (message) + 1;        size_t len = strlen (message) + 1;
       wchar_t *wmessage = NULL;        wchar_t *wmessage = NULL;
       mbstate_t st;        mbstate_t st;
Line 234  error_tail (int status, int errnum, const char *messag Line 243  error_tail (int status, int errnum, const char *messag
           if (res != len)            if (res != len)
             break;              break;
   
          if (__builtin_expect (len >= SIZE_MAX / 2, 0))          if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
             {              {
               /* This really should not happen if everything is fine.  */                /* This really should not happen if everything is fine.  */
               res = (size_t) -1;                res = (size_t) -1;
Line 263  error_tail (int status, int errnum, const char *messag Line 272  error_tail (int status, int errnum, const char *messag
   else    else
 #endif  #endif
     vfprintf (stderr, message, args);      vfprintf (stderr, message, args);
   va_end (args);  
   
   ++error_message_count;    ++error_message_count;
   if (errnum)    if (errnum)
Line 313  error (int status, int errnum, const char *message, .. Line 321  error (int status, int errnum, const char *message, ..
   
   va_start (args, message);    va_start (args, message);
   error_tail (status, errnum, message, args);    error_tail (status, errnum, message, args);
     va_end (args);
   
 #ifdef _LIBC  #ifdef _LIBC
   _IO_funlockfile (stderr);    _IO_funlockfile (stderr);
Line 339  error_at_line (int status, int errnum, const char *fil Line 348  error_at_line (int status, int errnum, const char *fil
   
       if (old_line_number == line_number        if (old_line_number == line_number
           && (file_name == old_file_name            && (file_name == old_file_name
              || strcmp (old_file_name, file_name) == 0))              || (old_file_name != NULL
                   && file_name != NULL
                   && strcmp (old_file_name, file_name) == 0)))
 
         /* Simply return and print nothing.  */          /* Simply return and print nothing.  */
         return;          return;
   
Line 371  error_at_line (int status, int errnum, const char *fil Line 383  error_at_line (int status, int errnum, const char *fil
     }      }
   
 #if _LIBC  #if _LIBC
  __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ",  __fxprintf (NULL, file_name != NULL ? "%s:%u: " : " ",
               file_name, line_number);                file_name, line_number);
 #else  #else
  fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",  fprintf (stderr, file_name != NULL ? "%s:%u: " : " ",
            file_name, line_number);             file_name, line_number);
 #endif  #endif
   
   va_start (args, message);    va_start (args, message);
   error_tail (status, errnum, message, args);    error_tail (status, errnum, message, args);
     va_end (args);
   
 #ifdef _LIBC  #ifdef _LIBC
   _IO_funlockfile (stderr);    _IO_funlockfile (stderr);
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>