mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-org-wsl".

The branch, legacy has been updated
       via  43446e97d80b003730ed434e57669909e651b2a8 (commit)
      from  7f210a0beee915334348d23c9ac68e07c5a6f8c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sf.net/p/mingw/mingw-org-wsl/ci/43446e97d80b003730ed434e57669909e651b2a8/

commit 43446e97d80b003730ed434e57669909e651b2a8
Author: Keith Marshall <kei...@us...>
Date:   Thu Dec 31 21:20:24 2015 +0000

    Avoid user namespace pollution by non-standard type 'off64_t'.

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index 0c7350d..88ae58a 100644
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,27 @@
+2015-12-30  Keith Marshall  <kei...@us...>
+
+	Avoid user namespace pollution by non-standard type 'off64_t'.
+
+	* include/sys/types.h (off64_t): Rename it as...
+	(__off64_t): ...this implementation-private alternative name, so
+	eliminating the potential for user namespace pollution.
+
+	* include/io.h (lseek64): Use '__off64_t', instead of 'off64_t', as
+	return type, and type of offset argument, in both prototype and inline
+	implementation; note that this addresses the issue of pollution in the
+	user namespace, while avoiding the issue of MinGW-Bug [#].
+
+	* include/stdio.h (fseeko64, __mingw_fseeko64): Use '__off64_t'
+	instead of 'off64_t', as offset argument type in function prototypes.
+	(ftello64): Likewise, for return type of inline function.
+
+	* mingwex/mingw-fseek.c: Assert copyright; tidy layout.
+	(WIN32_LEAN_AND_MEAN): Define, to minimize impact of <windows.h>.
+	(__mingw_fseeko64): Use '__off64_t' per modified function prototype.
+
+	* mingwex/stdio/fseeko64.c: Assert copyright.
+	(fseeko64): Use '__off64_t' per modified function prototype.
+
 2015-12-27  Keith Marshall  <kei...@us...>
 
 	Improve ISO-C conformity in MinGW printf(); cf. MinGW-Bug [#1761]
diff --git a/mingwrt/include/io.h b/mingwrt/include/io.h
index 535c658..f059f7e 100644
--- a/mingwrt/include/io.h
+++ b/mingwrt/include/io.h
@@ -6,6 +6,7 @@
  *
  * System level I/O functions and types.
  *
+ * TODO: File requires review; rationalization and refactoring recommended.
  */
 #ifndef	_IO_H_
 #define	_IO_H_
@@ -295,12 +296,10 @@ __CRT_ALIAS int __cdecl __MINGW_NOTHROW	_findnexti64 (intptr_t _v1, struct _find
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
 #ifndef __NO_MINGW_LFS
-__CRT_INLINE off64_t lseek64 (int, off64_t, int);
+__CRT_INLINE __off64_t lseek64 (int, __off64_t, int);
 __CRT_INLINE __JMPSTUB__(( FUNCTION = lseek64, REMAPPED = _lseeki64 ))
-off64_t lseek64 (int fd, off64_t offset, int whence)
-{
-  return _lseeki64(fd, (__int64) offset, whence);
-}
+__off64_t lseek64 (int fd, __off64_t offset, int whence)
+{ return _lseeki64(fd, (__int64)(offset), whence); }
 #endif
 
 #endif /* __MSVCRT__ */
diff --git a/mingwrt/include/stdio.h b/mingwrt/include/stdio.h
index 094ebad..2fc3c47 100644
--- a/mingwrt/include/stdio.h
+++ b/mingwrt/include/stdio.h
@@ -10,6 +10,7 @@
  * NOTE: The file manipulation functions provided by Microsoft seem to
  * work with either slash (/) or backslash (\) as the directory separator.
  *
+ * TODO: File requires review; rationalization and refactoring recommended.
  */
 
 #ifndef _STDIO_H_
@@ -625,34 +626,27 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	fileno (FILE*);
 #define fileno(__F) ((__F)->_file)
 #endif
 
-#if defined (__MSVCRT__) && !defined (__NO_MINGW_LFS)
+#if defined (__MSVCRT__) && ! defined (__NO_MINGW_LFS)
 #include <sys/types.h>
 __CRT_INLINE __JMPSTUB__(( FUNCTION = fopen64, REMAPPED = fopen ))
 FILE* __cdecl __MINGW_NOTHROW fopen64 (const char* filename, const char* mode)
 { return fopen (filename, mode); }
 
-int __cdecl __MINGW_NOTHROW fseeko64 (FILE*, off64_t, int);
+int __cdecl __MINGW_NOTHROW fseeko64 (FILE*, __off64_t, int);
 
 #ifdef __USE_MINGW_FSEEK
-int __cdecl __MINGW_NOTHROW __mingw_fseeko64 (FILE *, off64_t, int);
+int __cdecl __MINGW_NOTHROW __mingw_fseeko64 (FILE *, __off64_t, int);
 #define fseeko64(fp, offset, whence)  __mingw_fseeko64(fp, offset, whence)
 #endif
 
 __CRT_INLINE __LIBIMPL__(( FUNCTION = ftello64 ))
-off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream)
-{
-  fpos_t pos;
-  if (fgetpos(stream, &pos))
-    return  -1LL;
-  else
-   return ((off64_t) pos);
-}
-#endif /* __NO_MINGW_LFS */
+__off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream)
+{ fpos_t __pos; return (fgetpos(stream, &__pos)) ? -1LL : (__off64_t)(__pos); }
 
-#endif	/* Not __STRICT_ANSI__ */
+#endif /* __MSVCRT__ && !__NO_MINGW_LFS */
+#endif	/* !__STRICT_ANSI__ */
 
 /* Wide  versions */
-
 #ifndef _WSTDIO_DEFINED
 /*  also in wchar.h - keep in sync */
 _CRTIMP int __cdecl __MINGW_NOTHROW	fwprintf (FILE*, const wchar_t*, ...);
diff --git a/mingwrt/include/sys/types.h b/mingwrt/include/sys/types.h
index 2113f77..007b6b4 100644
--- a/mingwrt/include/sys/types.h
+++ b/mingwrt/include/sys/types.h
@@ -128,7 +128,7 @@ typedef long long fpos64_t;
 
 #ifndef _OFF64_T_
 #define _OFF64_T_
-typedef long long off64_t;
+typedef __int64 __off64_t;
 #endif
 
 #if _POSIX_C_SOURCE
diff --git a/mingwrt/mingwex/mingw-fseek.c b/mingwrt/mingwex/mingw-fseek.c
index 9154fa3..27b08ee 100644
--- a/mingwrt/mingwex/mingw-fseek.c
+++ b/mingwrt/mingwex/mingw-fseek.c
@@ -1,9 +1,38 @@
 /*
- * Workaround for limitations on win9x where a file contents are
- * not zero'd out if you seek past the end and then write.
- * Copied from ming local-patch to binutils/bfd/libbfd.c written by
- * Mumit Khan  <kh...@xr...>
+ * mingw-fseek.c
+ *
+ * Workaround for limitations on Win9x where extended file content
+ * is not zeroed out if you seek past the end and then write.
+ *
+ * $Id$
+ *
+ * Written by Mumit Khan  <kh...@xr...>
+ * Copyright (C) 1999, 2002-2005, 2011, 2015, MinGW.org Project.
+ *
+ * Abstracted from MinGW local patch to binutils/bfd/libbfd.c
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, this permission notice, and the following
+ * disclaimer shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OF OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
  */
+#define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>
 #include <stdio.h>
@@ -14,13 +43,12 @@
 static int __mingw_fseek_called;
 
 /* The fseek in Win9x runtime does not zero out the file if seeking past
-   the end; if you don't want random stuff from your disk included in your
-   output DLL/executable, use this version instead. On WinNT/Win2k, it
-   just calls runtime fseek().
-
-   CHECK/FIXME: Does this work for both text and binary modes?? */
-
-
+ * the end; if you don't want random stuff from your disk included in your
+ * output DLL/executable, use this version instead. On WinNT/Win2k, it
+ * just calls runtime fseek().
+ *
+ * CHECK/FIXME: Does this work for both text and binary modes??
+ */
 int
 __mingw_fseek (FILE *fp, long offset, int whence)
 {
@@ -30,7 +58,7 @@ __mingw_fseek (FILE *fp, long offset, int whence)
 }
 
 int
-__mingw_fseeko64 (FILE *fp, off64_t offset, int whence)
+__mingw_fseeko64 (FILE *fp, __off64_t offset, int whence)
 {
 # undef fseeko64
   __mingw_fseek_called = 1;
@@ -42,65 +70,69 @@ __mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
 {
 # undef fwrite
   if ((_osver & 0x8000) &&  __mingw_fseek_called)
-    {
-      ULARGE_INTEGER actual_length;
-      LARGE_INTEGER current_position = {{0LL}};
-      __mingw_fseek_called = 0;
-      fflush (fp);
-      actual_length.u.LowPart = GetFileSize ((HANDLE) _get_osfhandle (fileno (fp)),
-					     &actual_length.u.HighPart);
-      if (actual_length.u.LowPart == 0xFFFFFFFF
-          && GetLastError() != NO_ERROR )
-        return -1;
-      current_position.u.LowPart = SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
-						   current_position.u.LowPart,
-						   &current_position.u.HighPart,
-						 FILE_CURRENT);
-      if (current_position.u.LowPart == 0xFFFFFFFF
-          && GetLastError() != NO_ERROR )
-        return -1;
+  {
+    ULARGE_INTEGER actual_length;
+    LARGE_INTEGER current_position = {{0LL}};
+    __mingw_fseek_called = 0;
+    fflush (fp);
+    actual_length.u.LowPart = GetFileSize
+      ( (HANDLE) _get_osfhandle (fileno (fp)), &actual_length.u.HighPart
+      );
+    if (actual_length.u.LowPart == 0xFFFFFFFF && GetLastError() != NO_ERROR )
+      return -1;
+    current_position.u.LowPart = SetFilePointer
+      ( (HANDLE) _get_osfhandle (fileno (fp)), current_position.u.LowPart,
+	&current_position.u.HighPart, FILE_CURRENT
+      );
+    if (current_position.u.LowPart == 0xFFFFFFFF && GetLastError() != NO_ERROR )
+      return -1;
 
-#ifdef DEBUG
-      printf ("__mingw_fwrite: current %I64u, actual %I64u\n",
-	      current_position.QuadPart, actual_length.QuadPart);
-#endif /* DEBUG */
-      if (current_position.QuadPart > actual_length.QuadPart)
-	{
-	  static char __mingw_zeros[ZEROBLOCKSIZE];
-	  long long numleft;
-
-	  SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
-	                  0, 0, FILE_END);
-	  numleft = current_position.QuadPart - actual_length.QuadPart;
+#   ifdef DEBUG
+      printf( "__mingw_fwrite: current %I64u, actual %I64u\n",
+	  current_position.QuadPart, actual_length.QuadPart
+	);
+#   endif /* DEBUG */
+    if( current_position.QuadPart > actual_length.QuadPart )
+    {
+      static char __mingw_zeros[ZEROBLOCKSIZE];
+      long long numleft;
 
-#ifdef DEBUG
-	  printf ("__mingw_fwrite: Seeking %I64d bytes past end\n", numleft);
-#endif /* DEBUG */
-	  while (numleft > 0LL)
-	    {
-	      DWORD nzeros = (numleft > ZEROBLOCKSIZE)
-	                     ? ZEROBLOCKSIZE : numleft;
-	      DWORD written;
-	      if (! WriteFile ((HANDLE) _get_osfhandle (fileno (fp)),
-	                       __mingw_zeros, nzeros, &written, NULL))
-	        {
-		  /* Best we can hope for, or at least DJ says so. */
-	          SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
-	                          0, 0, FILE_BEGIN);
-		  return -1;
-		}
-	      if (written < nzeros)
-	        {
-		  /* Likewise. */
-	          SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
-	                          0, 0, FILE_BEGIN);
-		  return -1;
-		}
+      SetFilePointer( (HANDLE) _get_osfhandle (fileno (fp)), 0, 0, FILE_END );
+      numleft = current_position.QuadPart - actual_length.QuadPart;
 
-	      numleft -= written;
-	    }
-	    FlushFileBuffers ((HANDLE) _get_osfhandle (fileno (fp)));
+#     ifdef DEBUG
+	printf( "__mingw_fwrite: Seeking %I64d bytes past end\n", numleft );
+#     endif /* DEBUG */
+      while( numleft > 0LL )
+      {
+	DWORD nzeros = (numleft > ZEROBLOCKSIZE)
+	  ? ZEROBLOCKSIZE
+	  : numleft;
+	DWORD written;
+	if( ! WriteFile ((HANDLE) _get_osfhandle (fileno (fp)),
+	      __mingw_zeros, nzeros, &written, NULL)
+	  )
+	  { /* Best we can hope for, or at least DJ says so.
+	     */
+	    SetFilePointer( (HANDLE) _get_osfhandle (fileno (fp)),
+		0, 0, FILE_BEGIN
+	      );
+	    return -1;
+	  }
+	if( written < nzeros )
+	{
+	  /* Likewise. */
+	  SetFilePointer( (HANDLE) _get_osfhandle (fileno (fp)),
+	      0, 0, FILE_BEGIN
+	    );
+	  return -1;
 	}
+	numleft -= written;
+      }
+      FlushFileBuffers ((HANDLE) _get_osfhandle (fileno (fp)));
     }
-  return (fwrite) (buffer, size, count, fp);
+  }
+  return (fwrite)(buffer, size, count, fp);
 }
+
+/* $RCSfile$: end of file */
diff --git a/mingwrt/mingwex/stdio/fseeko64.c b/mingwrt/mingwex/stdio/fseeko64.c
index d8dcc0c..aba0fed 100644
--- a/mingwrt/mingwex/stdio/fseeko64.c
+++ b/mingwrt/mingwex/stdio/fseeko64.c
@@ -1,9 +1,42 @@
-#include <stdio.h>
+/*
+ * fseeko64.c
+ *
+ * Seek to 64-offset within a file stream; uses same reference bases
+ * as fseek(), but offset is an implementation specific __off64_t type.
+ *
+ * $Id$
+ *
+ * Written by Kees Zeelenberg <kz...@us...>
+ * and Danny Smith <dan...@us...>
+ * Copyright (C) 2004, 2005, 2015, MinGW.org Project
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, this permission notice, and the following
+ * disclaimer shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OF OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
 #include <io.h>
+#include <stdio.h>
 #include <errno.h>
 
 int __cdecl
-fseeko64 (FILE* stream, off64_t offset, int whence)
+fseeko64 (FILE* stream, __off64_t offset, int whence)
 {
   fpos_t pos;
   if (whence == SEEK_CUR)
@@ -11,16 +44,16 @@ fseeko64 (FILE* stream, off64_t offset, int whence)
       /* If stream is invalid, fgetpos sets errno. */
       if (fgetpos (stream, &pos))
         return (-1);
-      pos += (fpos_t) offset;
+      pos += (fpos_t)(offset);
     }
   else if (whence == SEEK_END)
     {
       /* If writing, we need to flush before getting file length.  */
       fflush (stream);
-      pos = (fpos_t) (_filelengthi64 (_fileno (stream)) + offset);
+      pos = (fpos_t)(_filelengthi64 (_fileno (stream)) + offset);
     }
   else if (whence == SEEK_SET)
-    pos = (fpos_t) offset;
+    pos = (fpos_t)(offset);
   else
     {
       errno = EINVAL;
@@ -28,3 +61,5 @@ fseeko64 (FILE* stream, off64_t offset, int whence)
     }
   return fsetpos (stream, &pos);
 }
+
+/* $RCSfile$: end of file */

-----------------------------------------------------------------------

Summary of changes:
 mingwrt/ChangeLog                |   24 ++++++
 mingwrt/include/io.h             |    9 +-
 mingwrt/include/stdio.h          |   22 ++---
 mingwrt/include/sys/types.h      |    2 +-
 mingwrt/mingwex/mingw-fseek.c    |  168 ++++++++++++++++++++++---------------
 mingwrt/mingwex/stdio/fseeko64.c |   45 +++++++++-
 6 files changed, 177 insertions(+), 93 deletions(-)


hooks/post-receive
-- 
Repository: mingw-org-wsl




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (12)
2001	Jan (13)	Feb (2)	Mar (1)	Apr (1)	May	Jun (38)	Jul (10)	Aug (70)	Sep (63)	Oct (61)	Nov (41)	Dec (28)
2002	Jan (43)	Feb (11)	Mar (9)	Apr (2)	May (97)	Jun (94)	Jul (13)	Aug (49)	Sep (41)	Oct (24)	Nov (55)	Dec (126)
2003	Jan (90)	Feb (75)	Mar (32)	Apr (24)	May (54)	Jun (54)	Jul (22)	Aug (4)	Sep (16)	Oct (8)	Nov (6)	Dec (13)
2004	Jan	Feb (17)	Mar (60)	Apr (21)	May (12)	Jun	Jul (13)	Aug	Sep (29)	Oct	Nov	Dec (2)
2005	Jan (22)	Feb (3)	Mar (2)	Apr (13)	May (82)	Jun (18)	Jul (30)	Aug (17)	Sep (3)	Oct (19)	Nov (4)	Dec (8)
2006	Jan (1)	Feb (6)	Mar (2)	Apr (40)	May	Jun (21)	Jul (1)	Aug (410)	Sep (3)	Oct	Nov (56)	Dec (7)
2007	Jan (19)	Feb	Mar (4)	Apr (8)	May (19)	Jun (6)	Jul (4)	Aug (6)	Sep	Oct (4)	Nov (3)	Dec (2)
2008	Jan (13)	Feb (18)	Mar (12)	Apr	May (2)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec
2009	Jan	Feb (6)	Mar (8)	Apr (2)	May (2)	Jun	Jul	Aug (2)	Sep (11)	Oct (13)	Nov (17)	Dec (6)
2010	Jan (24)	Feb (10)	Mar (27)	Apr (20)	May (108)	Jun (8)	Jul (23)	Aug (38)	Sep (49)	Oct (17)	Nov (12)	Dec (14)
2011	Jan (17)	Feb (7)	Mar (28)	Apr (8)	May (20)	Jun (11)	Jul (7)	Aug (12)	Sep (4)	Oct (20)	Nov (19)	Dec (2)
2012	Jan (2)	Feb (6)	Mar (5)	Apr (24)	May (5)	Jun (4)	Jul (6)	Aug (18)	Sep (38)	Oct (26)	Nov (12)	Dec (6)
2013	Jan (19)	Feb (18)	Mar (44)	Apr (35)	May (18)	Jun (21)	Jul (10)	Aug (19)	Sep (44)	Oct (25)	Nov (1)	Dec (2)
2014	Jan (8)	Feb	Mar	Apr (5)	May (1)	Jun (3)	Jul	Aug (3)	Sep	Oct (4)	Nov (4)	Dec (7)
2015	Jan	Feb	Mar (1)	Apr	May (2)	Jun (4)	Jul (6)	Aug (2)	Sep (8)	Oct (2)	Nov (1)	Dec (3)
2016	Jan (7)	Feb (9)	Mar (5)	Apr (5)	May (9)	Jun (4)	Jul (20)	Aug (4)	Sep (7)	Oct (6)	Nov (9)	Dec (2)
2017	Jan (7)	Feb (7)	Mar (5)	Apr	May (1)	Jun (4)	Jul (12)	Aug (4)	Sep (1)	Oct (4)	Nov (11)	Dec (14)
2018	Jan (3)	Feb (3)	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec

mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

A native Windows port of the GNU Compiler Collection (GCC)

mingw-cvs — List for CVS update notification

S	M	T	W	T	F	S
		1	2	3	4	5
6	7	8	9	10	11	12
13	14	15	16	17	18	19
20	21	22	23	24	25	26
27 (1)	28	29 (1)	30	31 (1)