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, 4.0-dev has been updated
       via  f70b9c84027bd3b1e3b7dc0df4827fafd23ecf9a (commit)
       via  c2adf77b9eb6e9fee48068f282aaf0c0f0be8dea (commit)
      from  5c582dfd1a0d8471477ffa3a6389cccf4928df34 (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/f70b9c84027bd3b1e3b7dc0df4827fafd23ecf9a/

commit f70b9c84027bd3b1e3b7dc0df4827fafd23ecf9a
Author: Keith Marshall <kei...@us...>
Date:   Thu Jan 30 14:22:18 2014 +0000

    Make dirent structure 64-bit deterministic; (cf. issue #2106)

diff --git a/ChangeLog b/ChangeLog
index d476472..dcf7fca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2014-01-30  Keith Marshall  <kei...@us...>
 
+	Make dirent structure 64-bit deterministic; (cf. issue #2106)
+
+	* include/dirent.h (struct dirent, struct _wdirent):
+	<d_time_create, d_time_access, d_time_write>: Declare as __time64_t.
+	<d_size>: Declare as uint64_t; include stdint.h to define it.
+
+	* src/libcrt/tchar/dirent.c (_finddata_t, _wfinddata_t): Define them
+	explicitly, making them respectively 64-bit clean local aliases for...
+	(__finddata64_t, __wfinddata64_t): ...these explicit structure types.
+	(DIRENT_OPEN, DIRENT_UPDATE) <dd_handle>: Always assign it, using...
+	(_tfindfirst64, _tfindnext64): ...these 64-bit clean functions.
+
+2014-01-30  Keith Marshall  <kei...@us...>
+
 	Correct _wfinddata64_t vs. __wfinddata64_t typo.
 
 	* include/io.h include/wchar.h (_wfinddata64_t): All MSDN data type
diff --git a/include/dirent.h b/include/dirent.h
index f965d0d..47cc580 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -27,12 +27,11 @@
 #include <_mingw.h>
 
 #include <io.h>
+#include <stdint.h>
 
 #ifndef RC_INVOKED
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+BEGIN_C_DECLS
 
 struct dirent
 {
@@ -40,16 +39,16 @@ struct dirent
 	unsigned short	d_reclen;	/* Always zero. */
 	unsigned short	d_namlen;	/* Length of name in d_name. */
 
-	/* The following exactly mimic the layout of _finddata_t ...
+	/* The following exactly mimic the layout of __finddata64_t ...
 	 */
 	unsigned	d_type;		/* File attributes */
-	time_t		d_time_create;
-	time_t		d_time_access;	/* always midnight local time */
-	time_t		d_time_write;
-	_fsize_t	d_size;
+	__time64_t	d_time_create;
+	__time64_t	d_time_access;	/* always midnight local time */
+	__time64_t	d_time_write;
+	uint64_t	d_size;
 	/*
-	 * ...so that we may map a union of _finddata_t at the
-	 * location of d_type (corresponding to _finddata_t.attrib),
+	 * ...so that we may map a union of __finddata64_t at the
+	 * location of d_type (corresponding to __finddata64_t.attrib),
 	 * and thus map this directly to the _findfirst/_findnext
 	 * returned field.
 	 */
@@ -78,16 +77,16 @@ struct _wdirent
 	unsigned short	d_reclen;	/* Always zero. */
 	unsigned short	d_namlen;	/* Length of name in d_name. */
 
-	/* The following exactly mimic the layout of _wfinddata_t ...
+	/* The following exactly mimic the layout of __wfinddata64_t ...
 	 */
 	unsigned	d_type;		/* File attributes */
-    	time_t		d_time_create;	/* -1 for FAT file systems */
-    	time_t		d_time_access;	/* -1 for FAT file systems */
-    	time_t		d_time_write;
-    	_fsize_t	d_size;
+    	__time64_t	d_time_create;	/* -1 for FAT file systems */
+    	__time64_t	d_time_access;	/* -1 for FAT file systems */
+    	__time64_t	d_time_write;
+    	uint64_t	d_size;
 	/*
-	 * ...so that we may map a union of _wfinddata_t at the
-	 * location of d_type (corresponding to _wfinddata_t.attrib),
+	 * ...so that we may map a union of __wfinddata64_t at the
+	 * location of d_type (corresponding to __wfinddata64_t.attrib),
 	 * and thus map this directly to the _wfindfirst/_wfindnext
 	 * returned field.
 	 */
@@ -107,10 +106,7 @@ void __cdecl __MINGW_NOTHROW _wrewinddir (_WDIR*);
 long __cdecl __MINGW_NOTHROW _wtelldir (_WDIR*);
 void __cdecl __MINGW_NOTHROW _wseekdir (_WDIR*, long);
 
-
-#ifdef	__cplusplus
-}
-#endif
+END_C_DECLS
 
 #if defined(_BSD_SOURCE) || defined(_WIN32)
 /*
diff --git a/src/libcrt/tchar/dirent.c b/src/libcrt/tchar/dirent.c
index 8d7f162..19b0c2a 100644
--- a/src/libcrt/tchar/dirent.c
+++ b/src/libcrt/tchar/dirent.c
@@ -21,10 +21,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include <io.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <io.h>
 #include <dirent.h>
 
 #define WIN32_LEAN_AND_MEAN
@@ -35,6 +35,19 @@
 #define DIRENT_REJECT( chk, err, rtn )	\
   do { if( chk ){ errno = (err); return rtn; }} while(0)
 
+/* MSDN says that _finddata_t is a macro, aliased to either _finddata64i32_t,
+ * or to _finddata32_t when _USE_32_BIT_TIME_T is defined; (MinGW also adopts
+ * this convention).  We prefer to avoid this _USE_32_BIT_TIME_T insanity; we
+ * would like our local notion of _finddata_t to represent __finddata64_t.
+ */
+#undef  _finddata_t
+#define _finddata_t  __finddata64_t
+
+/* Similarly for _wfinddata_t; we want it to represent __wfinddata64_t.
+ */
+#undef  _wfinddata_t
+#define _wfinddata_t __wfinddata64_t
+
 union __dirstream_t
 {
   /* Actual (private) declaration for opaque data type "DIR". */
@@ -130,10 +143,10 @@ union __wdirstream_t
 #define DT_IGNORED	(_A_RDONLY | _A_HIDDEN | _A_SYSTEM | _A_ARCH)
 
 #define DIRENT_OPEN(D)	\
-    ((D).dd_handle = _tfindfirst((D).dd_name, &((D).dd_dta)))
+    ((D).dd_handle = _tfindfirst64((D).dd_name, &((D).dd_dta)))
 
 #define DIRENT_UPDATE(D)  \
-    _tfindnext( (D).dd_handle, &(D).dd_dta )
+    _tfindnext64( (D).dd_handle, &(D).dd_dta )
 
 
 /*****

https://sf.net/p/mingw/mingw-org-wsl/ci/c2adf77b9eb6e9fee48068f282aaf0c0f0be8dea/

commit c2adf77b9eb6e9fee48068f282aaf0c0f0be8dea
Author: Keith Marshall <kei...@us...>
Date:   Thu Jan 30 09:58:09 2014 +0000

    Correct _wfinddata64_t vs. __wfinddata64_t typo.

diff --git a/ChangeLog b/ChangeLog
index 040c186..d476472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2014-01-30  Keith Marshall  <kei...@us...>
+
+	Correct _wfinddata64_t vs. __wfinddata64_t typo.
+
+	* include/io.h include/wchar.h (_wfinddata64_t): All MSDN data type
+	documentation denies the existence of this structure type, yet their
+	prototypes for the _wfindfirst64() and _wfindnext64() functions refer
+	to in in their argument lists; redefine it as an alias for...
+	(__wfinddata64_t): ...this formally documented structure type; update
+	all former references to use it.
+
+	* include/tchar.h (_tfinddata64_t): Map it to...
+	(__wfinddata64_t): ...this, in place of former mapping to...
+	(_wfinddata64_t): ...this.
+
 2014-01-27  Thorsten Otto  <th...@us...>
 
 	Remove superfluous objects from libmingwex.a; (cf. issue #2177)
diff --git a/include/io.h b/include/io.h
index 271d928..0b3e367 100644
--- a/include/io.h
+++ b/include/io.h
@@ -1,6 +1,6 @@
 /**
  * @file io.h
- * Copyright 2012, 2013 MinGW.org project
+ * Copyright 2012-2014 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"),
@@ -123,7 +123,16 @@ struct _wfinddata32_t {
 	wchar_t		name[FILENAME_MAX];
 };
 
-struct _wfinddata64_t {
+/* MSDN data type documentation refers to the 64-bit variant of the
+ * preceding structure as "__wfinddata64_t", but _wfindfirst64() and
+ * _wfindnext64() function prototypes then use "_wfinddata64_t" when
+ * declaring their arguments; assume that the former is correct for
+ * the structure declaration, but preserve an alias for the less
+ * trusted MSDN function prototype usage.
+ */
+#define _wfinddata64_t __wfinddata64_t
+
+struct __wfinddata64_t {
         unsigned    attrib;
         __time64_t  time_create;
         __time64_t  time_access;
@@ -173,7 +182,7 @@ intptr_t _findfirst64i32 (const char *filespec,struct _finddata64i32_t *fileinfo
 
 intptr_t _wfindfirst     (const wchar_t *filespec,struct _wfinddata_t *fileinfo);
 intptr_t _wfindfirst32   (const wchar_t *filespec,struct _wfinddata32_t *fileinfo);
-intptr_t _wfindfirst64   (const wchar_t *filespec, struct _wfinddata64_t   *fileinfo);
+intptr_t _wfindfirst64   (const wchar_t *filespec, struct __wfinddata64_t   *fileinfo);
 intptr_t _wfindfirsti64  (const wchar_t *filespec, struct _wfinddatai64_t   *fileinfo);
 intptr_t _wfindfirst32i64(const wchar_t *filespec, struct _wfinddata32i64_t *fileinfo);
 intptr_t _wfindfirst64i32(const wchar_t *filespec, struct _wfinddata64i32_t *fileinfo);
@@ -414,19 +423,19 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _wunlink(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wopen(const wchar_t*, int, ...);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wsopen(const wchar_t*, int, int, ...);
 _CRTIMP wchar_t * __cdecl __MINGW_NOTHROW _wmktemp(wchar_t*);
-_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst64(const wchar_t*, struct _wfinddata64_t*);
+_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst64(const wchar_t*, struct __wfinddata64_t*);
 intptr_t __cdecl __MINGW_NOTHROW _wfindfirst32i64 (const wchar_t*, struct _wfinddata32i64_t*);
 intptr_t __cdecl __MINGW_NOTHROW _wfindfirst64i32 (const wchar_t*, struct _wfinddata64i32_t*);
-_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnext64(intptr_t, struct _wfinddata64_t*);
+_CRTIMP int __cdecl __MINGW_NOTHROW _wfindnext64(intptr_t, struct __wfinddata64_t*);
 int  __cdecl __MINGW_NOTHROW	_wfindnext32i64 (intptr_t, struct _wfinddata32i64_t*);
 int  __cdecl __MINGW_NOTHROW	_wfindnext64i32 (intptr_t, struct _wfinddata64i32_t*);
 
 #include <string.h>
 __CRT_MAYBE_INLINE __cdecl __MINGW_NOTHROW intptr_t _wfindfirst32i64(const wchar_t* _filename, struct _wfinddata32i64_t* _fdata) {
-    struct _wfinddata64_t fd;
+    struct __wfinddata64_t fd;
     intptr_t ret = _wfindfirst64(_filename, &fd);
     if (ret == -1) {
-        memset(_fdata, 0, sizeof(struct _wfinddata64_t));
+        memset(_fdata, 0, sizeof(struct __wfinddata64_t));
         return ret;
     }
     _fdata->attrib = fd.attrib;
@@ -455,7 +464,7 @@ __CRT_MAYBE_INLINE __cdecl __MINGW_NOTHROW intptr_t _wfindfirst64i32(const wchar
 }
 
 __CRT_MAYBE_INLINE __cdecl __MINGW_NOTHROW intptr_t _wfindnext32i64(intptr_t _fp, struct _wfinddata32i64_t* _fdata) {
-    struct _wfinddata64_t fd;
+    struct __wfinddata64_t fd;
     int ret = _wfindnext64(_fp,&fd);
     if (ret == -1) {
       memset(_fdata, 0, sizeof(struct _wfinddata32i64_t));
@@ -565,7 +574,7 @@ wchar_t * 	wmktemp(wchar_t *);
 #define _findfirsti64 _findfirst64
 #define _findnexti64 _findnext64
 #define _wfinddata_t _wfinddata64i32_t
-#define _wfinddatai64_t _wfinddata64_t
+#define _wfinddatai64_t __wfinddata64_t
 #define _wfindfirst _wfindfirst64i32
 #define _wfindnext _wfindnext64i32
 #define _wfindfirsti64 _wfindfirst64
diff --git a/include/tchar.h b/include/tchar.h
index 1c0a8e1..1b694e9 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -228,7 +228,7 @@ typedef wchar_t _TCHAR;
 #define _tfindfirsti64  _wfindfirsti64
 #define _tfindnexti64   _wfindnexti64
 #define _tfinddatai64_t _wfinddatai64_t
-#define _tfinddata64_t    _wfinddata64_t
+#define _tfinddata64_t    __wfinddata64_t
 #define _tfinddata32_t    _wfinddata32_t
 #define _tfinddata32i64_t _wfinddata32i64_t
 #define _tfinddata64i32_t _wfinddata64i32_t
diff --git a/include/wchar.h b/include/wchar.h
index 87b8d84..e77225a 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,6 +1,6 @@
 /**
  * @file wchar.h
- * Copyright 2012, 2013 MinGW.org project
+ * Copyright 2012-2014 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"),
@@ -435,7 +435,15 @@ struct _wfinddatai64_t {
 	__int64     size;
 	wchar_t     name[FILENAME_MAX];
 };
-struct _wfinddata64_t {
+/* MSDN data type documentation refers to the 64-bit variant of the
+ * following structure as "__wfinddata64_t", but _wfindfirst64() and
+ * _wfindnext64() function prototypes then use "_wfinddata64_t" when
+ * declaring their arguments; assume that the former is correct for
+ * the structure declaration, but preserve an alias for the less
+ * trusted MSDN function prototype usage.
+ */
+#define _wfinddata64_t __wfinddata64_t
+struct __wfinddata64_t {
         unsigned    attrib;
         __time64_t  time_create;
         __time64_t  time_access;
@@ -492,8 +500,8 @@ intptr_t __cdecl __MINGW_NOTHROW	_wfindfirst64i32 (const wchar_t*, struct _wfind
 _CRTIMP int  __cdecl __MINGW_NOTHROW _wfindnext (intptr_t, struct _wfinddata32_t*);
 int  __cdecl __MINGW_NOTHROW	_wfindnext32i64 (intptr_t, struct _wfinddata32i64_t*);
 int  __cdecl __MINGW_NOTHROW	_wfindnext64i32 (intptr_t, struct _wfinddata64i32_t*);
-_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst64(const wchar_t*, struct _wfinddata64_t*);
-_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindnext64(intptr_t, struct _wfinddata64_t*);
+_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindfirst64(const wchar_t*, struct __wfinddata64_t*);
+_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindnext64(intptr_t, struct __wfinddata64_t*);
 
 /* _wfindfirst32 and _wfindnext32 do not exist in MSVCRT.DLL */
 _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirst32 (const wchar_t* _v1, struct _wfinddata32_t* _v2) {
@@ -505,10 +513,10 @@ _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnext32 (intptr_t _v1, struct _wfind
 
 #include <string.h>
 __CRT_MAYBE_INLINE __cdecl __MINGW_NOTHROW intptr_t _wfindfirst32i64(const wchar_t* _filename, struct _wfinddata32i64_t* _fdata) {
-    struct _wfinddata64_t fd;
+    struct __wfinddata64_t fd;
     intptr_t ret = _wfindfirst64(_filename, &fd);
     if (ret == -1) {
-        memset(_fdata, 0, sizeof(struct _wfinddata64_t));
+        memset(_fdata, 0, sizeof(struct __wfinddata64_t));
         return ret;
     }
     _fdata->attrib = fd.attrib;
@@ -537,7 +545,7 @@ __CRT_MAYBE_INLINE __cdecl __MINGW_NOTHROW intptr_t _wfindfirst64i32(const wchar
 }
 
 __CRT_MAYBE_INLINE __cdecl __MINGW_NOTHROW intptr_t _wfindnext32i64(intptr_t _fp, struct _wfinddata32i64_t* _fdata) {
-    struct _wfinddata64_t fd;
+    struct __wfinddata64_t fd;
     int ret = _wfindnext64(_fp,&fd);
     if (ret == -1) {
       memset(_fdata, 0, sizeof(struct _wfinddata32i64_t));
@@ -578,7 +586,7 @@ __CRT_MAYBE_INLINE __cdecl __MINGW_NOTHROW intptr_t _wfindnext64i32(intptr_t _fp
 
 #else /* !defined(_USE_32BIT_TIME_T) */
 #define _wfinddata_t _wfinddata64i32_t
-#define _wfinddatai64_t _wfinddata64_t
+#define _wfinddatai64_t __wfinddata64_t
 #define _wfindfirst _wfindfirst64i32
 #define _wfindnext _wfindnext64i32
 #define _wfindfirsti64 _wfindfirst64

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

Summary of changes:
 ChangeLog                 |   29 +++++++++++++++++++++++++++++
 include/dirent.h          |   38 +++++++++++++++++---------------------
 include/io.h              |   27 ++++++++++++++++++---------
 include/tchar.h           |    2 +-
 include/wchar.h           |   24 ++++++++++++++++--------
 src/libcrt/tchar/dirent.c |   19 ++++++++++++++++---
 6 files changed, 97 insertions(+), 42 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 (2)
12	13	14	15	16	17 (1)	18
19	20 (1)	21	22 (1)	23	24	25
26	27 (2)	28	29	30 (1)	31