Revert "Update gnulib to current upstream master"

[deliverable/binutils-gdb.git] / gdb / gnulib / import / fstat.c

diff --git a/gdb/gnulib/import/fstat.c b/gdb/gnulib/import/fstat.c
index 41ee7618d22152aeb1acb0c7b6ad796ea00af724..435c4290702cf589e2911569439a7c6304262ab3 100644 (file)
--- a/gdb/gnulib/import/fstat.c
+++ b/gdb/gnulib/import/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
 
    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
@@ -12,7 +12,7 @@
    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/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* If the user's config.h happens to include <sys/stat.h>, let it include only
    the system's <sys/stat.h> here, so that orig_fstat doesn't recurse to
@@ -23,13 +23,13 @@
 /* Get the original definition of fstat.  It might be defined as a macro.  */
 #include <sys/types.h>
 #include <sys/stat.h>
-#undef __need_system_sys_stat_h
-
-#if defined _WIN32 && ! defined __CYGWIN__
-# define WINDOWS_NATIVE
+#if _GL_WINDOWS_64_BIT_ST_SIZE
+# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
+# define stat _stati64
+# undef fstat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */
+# define fstat _fstati64
 #endif
-
-#if !defined WINDOWS_NATIVE
+#undef __need_system_sys_stat_h
 
 static int
 orig_fstat (int fd, struct stat *buf)
@@ -37,27 +37,40 @@ orig_fstat (int fd, struct stat *buf)
   return fstat (fd, buf);
 }
 
-#endif
-
 /* Specification.  */
 /* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
    eliminates this include because of the preliminary #include <sys/stat.h>
    above.  */
 #include "sys/stat.h"
 
-#include "stat-time.h"
-
 #include <errno.h>
 #include <unistd.h>
-#ifdef WINDOWS_NATIVE
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# if GNULIB_MSVC_NOTHROW
-#  include "msvc-nothrow.h"
-# else
-#  include <io.h>
-# endif
-# include "stat-w32.h"
+
+#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+# include "msvc-inval.h"
+#endif
+
+#if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+static int
+fstat_nothrow (int fd, struct stat *buf)
+{
+  int result;
+
+  TRY_MSVC_INVAL
+    {
+      result = orig_fstat (fd, buf);
+    }
+  CATCH_MSVC_INVAL
+    {
+      result = -1;
+      errno = EBADF;
+    }
+  DONE_MSVC_INVAL;
+
+  return result;
+}
+#else
+# define fstat_nothrow orig_fstat
 #endif
 
 int
@@ -71,20 +84,5 @@ rpl_fstat (int fd, struct stat *buf)
     return stat (name, buf);
 #endif
 
-#ifdef WINDOWS_NATIVE
-  /* Fill the fields ourselves, because the original fstat function returns
-     values for st_atime, st_mtime, st_ctime that depend on the current time
-     zone.  See
-     <https://lists.gnu.org/r/bug-gnulib/2017-04/msg00134.html>  */
-  HANDLE h = (HANDLE) _get_osfhandle (fd);
-
-  if (h == INVALID_HANDLE_VALUE)
-    {
-      errno = EBADF;
-      return -1;
-    }
-  return _gl_fstat_by_handle (h, NULL, buf);
-#else
-  return stat_time_normalize (orig_fstat (fd, buf), buf);
-#endif
+  return fstat_nothrow (fd, buf);
 }