Use struct_fstat for fstat

Sigh, it is not enough that we can't use struct stat normally -- it
seems we also have to use struct_fstat when calling fstat!  As the
comment says:

/* On Windows the 64-bit stat requires an explicitly different type
   for the 2nd argument, so we define a struct_stat macro that expands
   to the appropriate type on Windows, and to the regular struct stat
   on Unix.

   Note that Borland C 5.5 has 64-bit stat (_stati64), but not a
   64-bit fstat!  Because of that we also need a struct_fstat that
   points to struct_stat on Unix and on Windows, except under Borland,
   where it points to the 32-bit struct stat.  */

Bletch!


2005-06-23  Hrvoje Niksic  <[email protected]>

	* utils.c (read_file): Ditto.

	* main.c (main): Use struct_fstat.

	* mswindows.h (struct_fstat): Define a struct_fstat to deal with
	the fact that Borland 5.5 has 64-bit stat, but not 64-bit fstat!

2005-06-22  Hrvoje Niksic  <[email protected]>
Index: src/utils.c
===================================================================
--- src/utils.c	(revision 1766)
+++ src/utils.c	(working copy)
@@ -917,7 +917,7 @@
 
 #ifdef HAVE_MMAP
   {
-    struct_stat buf;
+    struct_fstat buf;
     if (fstat (fd, &buf) < 0)
       goto mmap_lose;
     fm->length = buf.st_size;
Index: src/sysdep.h
===================================================================
--- src/sysdep.h	(revision 1778)
+++ src/sysdep.h	(working copy)
@@ -125,10 +125,14 @@
 # define LARGE_INT_FMT "%.0f"
 #endif
 
-/* Under Windows we #define struct_stat to struct _stati64. */
+/* These are needed so we can #define struct_stat to struct _stati64
+   under Windows. */
 #ifndef struct_stat
 # define struct_stat struct stat
 #endif
+#ifndef struct_fstat
+# define struct_fstat struct stat
+#endif
 
 /* For CHAR_BIT, LONG_MAX, etc. */
 #include <limits.h>
Index: src/mswindows.h
===================================================================
--- src/mswindows.h	(revision 1778)
+++ src/mswindows.h	(working copy)
@@ -97,28 +97,34 @@
 #define str_to_wgint str_to_int64
 __int64 str_to_int64 (const char *, char **, int);
 
-/* No lstat on Windows.  */
+/* Windows has no symlink, therefore no lstat.  Without symlinks lstat
+   is equivalent to stat anyway.  */
 #define lstat stat
 
-/* On Windows the 64-bit stat requires a different version of struct
-   stat.  (On Unix too, but it happens transparently when stat is
-   remapped to stat64.)  */
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-# define struct_stat struct _stati64
-#elif defined(__BORLANDC__)
-# define struct_stat struct stati64
-#else
-# define struct_stat struct stat
-#endif
-
 /* Transparently support statting large files, like POSIX's LFS API
-   does.  */
+   does.  All Windows compilers we support use _stati64 (but have
+   different names for 2nd argument type, see below), so we use
+   that.  */
 #define stat(fname, buf) _stati64 (fname, buf)
 
+/* On Windows the 64-bit stat requires an explicitly different type
+   for the 2nd argument, so we define a struct_stat macro that expands
+   to the appropriate type on Windows, and to the regular struct stat
+   on Unix.
+
+   Note that Borland C 5.5 has 64-bit stat (_stati64), but not a
+   64-bit fstat!  Because of that we also need a struct_fstat that
+   points to struct_stat on Unix and on Windows, except under Borland,
+   where it points to the 32-bit struct stat.  */
+
 #ifndef __BORLANDC__
 # define fstat(fd, buf) _fstati64 (fd, buf)
-#endif
+# define struct_stat  struct _stati64
+# define struct_fstat struct _stati64
+#else  /* __BORLANDC__ */
+# define struct_stat  struct stati64
+# define struct_fstat struct stat
+#endif /* __BORLANDC__ */
 
 #define PATH_SEPARATOR '\\'
 
Index: src/main.c
===================================================================
--- src/main.c	(revision 1766)
+++ src/main.c	(working copy)
@@ -883,7 +883,7 @@
 	output_stream = stdout;
       else
 	{
-	  struct_stat st;
+	  struct_fstat st;
 	  output_stream = fopen (opt.output_document,
 				 opt.always_rest ? "ab" : "wb");
 	  if (output_stream == NULL)