[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.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:48 version 1.1.1.2, 2012/05/29 09:29:43
Line 1 Line 1
 /* Error handler for noninteractive utilities  /* Error handler for noninteractive utilities
   Copyright (C) 1990-1998, 2000-2007 Free Software Foundation, Inc.   Copyright (C) 1990-1998, 2000-2007, 2009-2011 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 70  unsigned int error_message_count; Line 70  unsigned int error_message_count;
 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
Line 85  extern void __error_at_line (int status, int errnum, c Line 85  extern void __error_at_line (int status, int errnum, c
   
 #else /* not _LIBC */  #else /* not _LIBC */
   
# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P# include <fcntl.h>
 # include <unistd.h>
 
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* Get declarations of the Win32 API functions.  */
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 # endif
 
 /* The gnulib override of fcntl is not needed in this file.  */
 # undef fcntl
 
 # if !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
 char *strerror_r ();  char *strerror_r ();
   #  else
   int strerror_r ();
   #  endif
 # endif  # endif
   
 /* The calling program should define program_name and set it to the  /* The calling program should define program_name and set it to the
Line 98  extern char *program_name; Line 114  extern char *program_name;
   
 # if HAVE_STRERROR_R || defined strerror_r  # if HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r  #  define __strerror_r strerror_r
# endif /* HAVE_STRERROR_R || defined strerror_r */# endif /* HAVE_STRERROR_R || defined strerror_r */
#endif  /* not _LIBC */#endif  /* not _LIBC */
   
   #if !_LIBC
   /* Return non-zero if FD is open.  */
   static inline int
   is_open (int fd)
   {
   # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
     /* On Win32: The initial state of unassigned standard file descriptors is
        that they are open but point to an INVALID_HANDLE_VALUE.  There is no
        fcntl, and the gnulib replacement fcntl does not support F_GETFL.  */
     return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
   # else
   #  ifndef F_GETFL
   #   error Please port fcntl to your platform
   #  endif
     return 0 <= fcntl (fd, F_GETFL);
   # endif
   }
   #endif
   
   static inline void
   flush_stdout (void)
   {
   #if !_LIBC
     int stdout_fd;
   
   # if GNULIB_FREOPEN_SAFER
     /* Use of gnulib's freopen-safer module normally ensures that
          fileno (stdout) == 1
        whenever stdout is open.  */
     stdout_fd = STDOUT_FILENO;
   # else
     /* POSIX states that fileno (stdout) after fclose is unspecified.  But in
        practice it is not a problem, because stdout is statically allocated and
        the fd of a FILE stream is stored as a field in its allocated memory.  */
     stdout_fd = fileno (stdout);
   # endif
     /* POSIX states that fflush (stdout) after fclose is unspecified; it
        is safe in glibc, but not on all other platforms.  fflush (NULL)
        is always defined, but too draconian.  */
     if (0 <= stdout_fd && is_open (stdout_fd))
   #endif
       fflush (stdout);
   }
   
 static void  static void
 print_errno_message (int errnum)  print_errno_message (int errnum)
 {  {
Line 147  error_tail (int status, int errnum, const char *messag Line 207  error_tail (int status, int errnum, const char *messag
       bool use_malloc = false;        bool use_malloc = false;
   
       while (1)        while (1)
        {        {
          if (__libc_use_alloca (len * sizeof (wchar_t)))          if (__libc_use_alloca (len * sizeof (wchar_t)))
            wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));            wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
          else          else
            {            {
              if (!use_malloc)              if (!use_malloc)
                wmessage = NULL;                wmessage = NULL;
   
              wchar_t *p = (wchar_t *) realloc (wmessage,              wchar_t *p = (wchar_t *) realloc (wmessage,
                                                len * sizeof (wchar_t));                                                len * sizeof (wchar_t));
              if (p == NULL)              if (p == NULL)
                {                {
                  free (wmessage);                  free (wmessage);
                  fputws_unlocked (L"out of memory\n", stderr);                  fputws_unlocked (L"out of memory\n", stderr);
                  return;                  return;
                }                }
              wmessage = p;              wmessage = p;
              use_malloc = true;              use_malloc = true;
            }            }
   
          memset (&st, '\0', sizeof (st));          memset (&st, '\0', sizeof (st));
          tmp = message;          tmp = message;
   
          res = mbsrtowcs (wmessage, &tmp, len, &st);          res = mbsrtowcs (wmessage, &tmp, len, &st);
          if (res != len)          if (res != len)
            break;            break;
   
          if (__builtin_expect (len >= SIZE_MAX / 2, 0))          if (__builtin_expect (len >= SIZE_MAX / 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;
              break;              break;
            }            }
   
          len *= 2;          len *= 2;
        }        }
   
       if (res == (size_t) -1)        if (res == (size_t) -1)
        {        {
          /* The string cannot be converted.  */          /* The string cannot be converted.  */
          if (use_malloc)          if (use_malloc)
            {            {
              free (wmessage);              free (wmessage);
              use_malloc = false;              use_malloc = false;
            }            }
          wmessage = (wchar_t *) L"???";          wmessage = (wchar_t *) L"???";
        }        }
   
       __vfwprintf (stderr, wmessage, args);        __vfwprintf (stderr, wmessage, args);
   
       if (use_malloc)        if (use_malloc)
        free (wmessage);        free (wmessage);
     }      }
   else    else
 #endif  #endif
Line 233  error (int status, int errnum, const char *message, .. Line 293  error (int status, int errnum, const char *message, ..
      cancellation.  Therefore disable cancellation for now.  */       cancellation.  Therefore disable cancellation for now.  */
   int state = PTHREAD_CANCEL_ENABLE;    int state = PTHREAD_CANCEL_ENABLE;
   __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),    __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
                   0);                   0);
 #endif  #endif
   
  fflush (stdout);  flush_stdout ();
 #ifdef _LIBC  #ifdef _LIBC
   _IO_flockfile (stderr);    _IO_flockfile (stderr);
 #endif  #endif
Line 268  int error_one_per_line; Line 328  int error_one_per_line;
   
 void  void
 error_at_line (int status, int errnum, const char *file_name,  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, ...)
 {  {
   va_list args;    va_list args;
   
Line 278  error_at_line (int status, int errnum, const char *fil Line 338  error_at_line (int status, int errnum, const char *fil
       static unsigned int old_line_number;        static unsigned int old_line_number;
   
       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))              || strcmp (old_file_name, file_name) == 0))
        /* Simply return and print nothing.  */        /* Simply return and print nothing.  */
        return;        return;
   
       old_file_name = file_name;        old_file_name = file_name;
       old_line_number = line_number;        old_line_number = line_number;
Line 292  error_at_line (int status, int errnum, const char *fil Line 352  error_at_line (int status, int errnum, const char *fil
      cancellation.  Therefore disable cancellation for now.  */       cancellation.  Therefore disable cancellation for now.  */
   int state = PTHREAD_CANCEL_ENABLE;    int state = PTHREAD_CANCEL_ENABLE;
   __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),    __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
                   0);                   0);
 #endif  #endif
   
  fflush (stdout);  flush_stdout ();
 #ifdef _LIBC  #ifdef _LIBC
   _IO_flockfile (stderr);    _IO_flockfile (stderr);
 #endif  #endif
Line 312  error_at_line (int status, int errnum, const char *fil Line 372  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:%d: " : " ",
              file_name, line_number);              file_name, line_number);
 #else  #else
   fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",    fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",
           file_name, line_number);           file_name, line_number);
 #endif  #endif
   
   va_start (args, message);    va_start (args, message);
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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