kc3-lang/gnulib/lib/stdio-read.c

• Show log

  Commit

• Hash : 44b65c48
  Author :
  Date : 2018-05-03T23:09:42
  

  Simplify code. Drop support for Borland C++ on Windows.
  
  Reported by Gisle Vanem <gisle.vanem@gmail.com>.
  
  * lib/accept4.c: Simplify 'defined _WIN32 || defined __WIN32__' to just
  'defined _WIN32'.
  * lib/canonicalize-lgpl.c: Likewise.
  * lib/classpath.c: Likewise.
  * lib/clean-temp.c: Likewise.
  * lib/csharpexec.c: Likewise.
  * lib/ctime.c: Likewise.
  * lib/dosname.h: Likewise.
  * lib/dup2.c: Likewise.
  * lib/errno.in.h: Likewise.
  * lib/error.c: Likewise.
  * lib/euidaccess.c: Likewise.
  * lib/execute.c: Likewise.
  * lib/fcntl.in.h: Likewise.
  * lib/fcntl.c: Likewise.
  * lib/filename.h: Likewise.
  * lib/findprog.c: Likewise.
  * lib/flock.c: Likewise.
  * lib/fopen.c: Likewise.
  * lib/freopen.c: Likewise.
  * lib/fstat.c: Likewise.
  * lib/fsync.c: Likewise.
  * lib/gc-gnulib.c: Likewise.
  * lib/get-rusage-data.c: Likewise.
  * lib/getaddrinfo.c: Likewise.
  * lib/getdelim.c: Likewise.
  * lib/getdtablesize.c: Likewise.
  * lib/gethostname.c: Likewise.
  * lib/getlogin.c: Likewise.
  * lib/getlogin_r.c: Likewise.
  * lib/getopt.c: Likewise.
  * lib/getpagesize.c: Likewise.
  * lib/getpass.c: Likewise.
  * lib/getrusage.c: Likewise.
  * lib/gettimeofday.c: Likewise.
  * lib/glob.c: Likewise.
  * lib/inttypes.in.h: Likewise.
  * lib/isapipe.c: Likewise.
  * lib/javaexec.c: Likewise.
  * lib/link.c: Likewise.
  * lib/localcharset.c: Likewise.
  * lib/localename.h: Likewise.
  * lib/localename.c: Likewise.
  * lib/localtime.c: Likewise.
  * lib/lseek.c: Likewise.
  * lib/mbsinit.c: Likewise.
  * lib/mkdir.c: Likewise.
  * lib/msvc-nothrow.h: Likewise.
  * lib/nanosleep.c: Likewise.
  * lib/nl_langinfo.c: Likewise.
  * lib/nonblocking.c: Likewise.
  * lib/nproc.c: Likewise.
  * lib/open.c: Likewise.
  * lib/openpty.c: Likewise.
  * lib/pathmax.h: Likewise.
  * lib/pipe-filter-aux.c: Likewise.
  * lib/pipe-filter-gi.c: Likewise.
  * lib/pipe-filter-ii.c: Likewise.
  * lib/pipe.c: Likewise.
  * lib/pipe2.c: Likewise.
  * lib/poll.c: Likewise.
  * lib/popen.c: Likewise.
  * lib/posix_openpt.c: Likewise.
  * lib/printf-parse.c: Likewise.
  * lib/progreloc.c: Likewise.
  * lib/putenv.c: Likewise.
  * lib/read.c: Likewise.
  * lib/relocatable.c: Likewise.
  * lib/rename.c: Likewise.
  * lib/same-inode.h: Likewise.
  * lib/secure_getenv.c: Likewise.
  * lib/select.c: Likewise.
  * lib/sethostname.c: Likewise.
  * lib/setlocale.c: Likewise.
  * lib/sigaction.c: Likewise.
  * lib/sigprocmask.c: Likewise.
  * lib/sleep.c: Likewise.
  * lib/spawn-pipe.h: Likewise.
  * lib/spawn-pipe.c: Likewise.
  * lib/spawni.c: Likewise.
  * lib/stat-time.h: Likewise.
  * lib/stat-w32.c: Likewise.
  * lib/stat.c: Likewise.
  * lib/stdio.in.h: Likewise.
  * lib/stdio-impl.h: Likewise.
  * lib/stdio-read.c: Likewise.
  * lib/stdio-write.c: Likewise.
  * lib/stdlib.in.h: Likewise.
  * lib/strerror_r.c: Likewise.
  * lib/strftime-fixes.c: Likewise.
  * lib/sys_stat.in.h: Likewise.
  * lib/sys_types.in.h: Likewise.
  * lib/sys_wait.in.h : Likewise.
  * lib/system-quote.h: Likewise.
  * lib/system-quote.c: Likewise.
  * lib/tmpdir.c: Likewise.
  * lib/tzset.c: Likewise.
  * lib/uname.c: Likewise.
  * lib/unistd.in.h: Likewise.
  * lib/utime.in.h: Likewise.
  * lib/utime.c: Likewise.
  * lib/utimecmp.c: Likewise.
  * lib/utimens.c: Likewise.
  * lib/vasnprintf.c: Likewise.
  * lib/vma-iter.h: Likewise.
  * lib/vma-iter.c: Likewise.
  * lib/wait-process.c: Likewise.
  * lib/wcsftime.c: Likewise.
  * lib/wctype.in.h: Likewise.
  * lib/write.c: Likewise.
  * tests/nap.h: Likewise.
  * tests/test-cloexec.c: Likewise.
  * tests/test-dup-safer.c: Likewise.
  * tests/test-dup2.c: Likewise.
  * tests/test-dup3.c: Likewise.
  * tests/test-fcntl.c: Likewise.
  * tests/test-get-rusage-data.c: Likewise.
  * tests/test-getaddrinfo.c: Likewise.
  * tests/test-getlogin.h: Likewise.
  * tests/test-isatty.c: Likewise.
  * tests/test-localename.c: Likewise.
  * tests/test-mbrtowc-w32.c: Likewise.
  * tests/test-nonblocking.c: Likewise.
  * tests/test-nonblocking-pipe-main.c: Likewise.
  * tests/test-nonblocking-socket-main.c: Likewise.
  * tests/test-nonblocking-socket.h: Likewise.
  * tests/test-pipe.c: Likewise.
  * tests/test-pipe2.c: Likewise.
  * tests/test-poll.c: Likewise.
  * tests/test-pthread_sigmask1.c: Likewise.
  * tests/test-select.h: Likewise.
  * tests/test-sethostname2.c: Likewise.
  * tests/test-sigprocmask.c: Likewise.
  * tests/test-spawn-pipe-child.c: Likewise.
  * tests/test-stat-time.c: Likewise.
  * tests/test-system-quote-main.c: Likewise.
  * tests/test-utimens-common.h: Likewise.
  * tests/test-wcrtomb-w32.c: Likewise.
  * m4/csharpexec.m4 (gt_CSHARPEXEC): Likewise.
  * m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise.
  * m4/javacomp.m4 (gt_JAVACOMP): Likewise.
  * m4/javaexec.m4 (gt_JAVAEXEC): Likewise.
  * m4/locale-ar.m4 (gt_LOCALE_AR): Likewise.
  * m4/locale-fr.m4 (gt_LOCALE_FR, gt_LOCALE_FR_UTF8): Likewise.
  * m4/locale-ja.m4 (gt_LOCALE_JA): Likewise.
  * m4/locale-tr.m4 (gt_LOCALE_TR_UTF8): Likewise.
  * m4/locale-zh.m4 (gt_LOCALE_ZH_CN): Likewise.
  * m4/malloc.m4 (gl_CHECK_MALLOC_POSIX): Likewise.
  * m4/nocrash.m4 (GL_NOCRASH): Likewise.
  * m4/pathmax.m4 (gl_PATHMAX_SNIPPET): Likewise.
  * m4/ptsname_r.m4 (gl_PREREQ_PTSNAME_R): Likewise.
  * m4/stdio_h.m4 (gl_STDIO_H): Likewise.
  * m4/tmpfile.m4 (gl_FUNC_TMPFILE): Likewise.
  * m4/unistd_h.m4 (gl_UNISTD_H): Likewise.
  

Download

• lib/stdio-read.c

• /* POSIX compatible FILE stream read function.
     Copyright (C) 2008-2018 Free Software Foundation, Inc.
     Written by Bruno Haible <bruno@clisp.org>, 2011.
  
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
  
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
  
  #include <config.h>
  
  /* Specification.  */
  #include <stdio.h>
  
  /* Replace these functions only if module 'nonblocking' is requested.  */
  #if GNULIB_NONBLOCKING
  
  /* On native Windows platforms, when read() is called on a non-blocking pipe
     with an empty buffer, ReadFile() fails with error GetLastError() =
     ERROR_NO_DATA, and read() in consequence fails with error EINVAL.  This
     read() function is at the basis of the function which fills the buffer of
     a FILE stream.  */
  
  # if defined _WIN32 && ! defined __CYGWIN__
  
  #  include <errno.h>
  #  include <io.h>
  
  #  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
  #  include <windows.h>
  
  #  if GNULIB_MSVC_NOTHROW
  #   include "msvc-nothrow.h"
  #  else
  #   include <io.h>
  #  endif
  
  #  define CALL_WITH_ERRNO_FIX(RETTYPE, EXPRESSION, FAILED) \
    if (ferror (stream))                                                        \
      return (EXPRESSION);                                                      \
    else                                                                        \
      {                                                                         \
        RETTYPE ret;                                                            \
        SetLastError (0);                                                       \
        ret = (EXPRESSION);                                                     \
        if (FAILED)                                                             \
          {                                                                     \
            if (GetLastError () == ERROR_NO_DATA && ferror (stream))            \
              {                                                                 \
                int fd = fileno (stream);                                       \
                if (fd >= 0)                                                    \
                  {                                                             \
                    HANDLE h = (HANDLE) _get_osfhandle (fd);                    \
                    if (GetFileType (h) == FILE_TYPE_PIPE)                      \
                      {                                                         \
                        /* h is a pipe or socket.  */                           \
                        DWORD state;                                            \
                        if (GetNamedPipeHandleState (h, &state, NULL, NULL,     \
                                                     NULL, NULL, 0)             \
                            && (state & PIPE_NOWAIT) != 0)                      \
                          /* h is a pipe in non-blocking mode.                  \
                             Change errno from EINVAL to EAGAIN.  */            \
                          errno = EAGAIN;                                       \
                      }                                                         \
                  }                                                             \
              }                                                                 \
          }                                                                     \
        return ret;                                                             \
      }
  
  /* Enable this function definition only if gnulib's <stdio.h> has prepared it.
     Otherwise we get a function definition conflict with mingw64's <stdio.h>.  */
  #  if GNULIB_SCANF
  int
  scanf (const char *format, ...)
  {
    int retval;
    va_list args;
  
    va_start (args, format);
    retval = vfscanf (stdin, format, args);
    va_end (args);
  
    return retval;
  }
  #  endif
  
  /* Enable this function definition only if gnulib's <stdio.h> has prepared it.
     Otherwise we get a function definition conflict with mingw64's <stdio.h>.  */
  #  if GNULIB_FSCANF
  int
  fscanf (FILE *stream, const char *format, ...)
  {
    int retval;
    va_list args;
  
    va_start (args, format);
    retval = vfscanf (stream, format, args);
    va_end (args);
  
    return retval;
  }
  #  endif
  
  /* Enable this function definition only if gnulib's <stdio.h> has prepared it.
     Otherwise we get a function definition conflict with mingw64's <stdio.h>.  */
  #  if GNULIB_VSCANF
  int
  vscanf (const char *format, va_list args)
  {
    return vfscanf (stdin, format, args);
  }
  #  endif
  
  /* Enable this function definition only if gnulib's <stdio.h> has prepared it.
     Otherwise we get a function definition conflict with mingw64's <stdio.h>.  */
  #  if GNULIB_VFSCANF
  int
  vfscanf (FILE *stream, const char *format, va_list args)
  #undef vfscanf
  {
    CALL_WITH_ERRNO_FIX (int, vfscanf (stream, format, args), ret == EOF)
  }
  #  endif
  
  int
  getchar (void)
  {
    return fgetc (stdin);
  }
  
  int
  fgetc (FILE *stream)
  #undef fgetc
  {
    CALL_WITH_ERRNO_FIX (int, fgetc (stream), ret == EOF)
  }
  
  char *
  fgets (char *s, int n, FILE *stream)
  #undef fgets
  {
    CALL_WITH_ERRNO_FIX (char *, fgets (s, n, stream), ret == NULL)
  }
  
  /* We intentionally don't bother to fix gets.  */
  
  size_t
  fread (void *ptr, size_t s, size_t n, FILE *stream)
  #undef fread
  {
    CALL_WITH_ERRNO_FIX (size_t, fread (ptr, s, n, stream), ret < n)
  }
  
  # endif
  #endif
  

Download