'MinGW-cvs Digest, Vol 62, Issue 6'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mingw-cvs
Subject:    MinGW-cvs Digest, Vol 62, Issue 6
From:       mingw-cvs-request () lists ! sourceforge ! net
Date:       2013-06-27 20:06:12
Message-ID: mailman.74007.1372363572.12996.mingw-cvs () lists ! sourceforge ! net
[Download RAW message or body]

Send MinGW-cvs mailing list submissions to
	mingw-cvs@lists.sourceforge.net

To subscribe or unsubscribe via the World Wide Web, visit
	https://lists.sourceforge.net/lists/listinfo/mingw-cvs
or, via email, send a message with subject or body 'help' to
	mingw-cvs-request@lists.sourceforge.net

You can reach the person managing the list at
	mingw-cvs-owner@lists.sourceforge.net

When replying, please edit your Subject line so it is more specific
than "Re: Contents of MinGW-cvs digest..."


This list will notify you of updates to the code stored in CVS.  Typically only \
developers with access to update the CVS are interested in this list.  However, this \
list can be beneficial to see what is happening with your changes.  If you wish to \
unsubscribe please do so at https://lists.sourceforge.net/lists/listinfo/mingw-cvs.

Today's Topics:

   1. [git push mingw-org-wsl]Repository: mingw-org-wsl	branch,
      4.0-dev, updated. 22068f31e7e2118d462387e1f27c806eba76ac5f
      (Keith Marshall)
   2. [git push mingw-org-wsl]Repository: mingw-org-wsl	branch,
      4.0-dev, updated. 2e1e5c90e5078ebcfa6c51271706e49b934b9a86
      (Earnie Boyd)
   3. [git push mingw-org-wsl]Repository: mingw-org-wsl	branch,
      4.0-dev, updated. c9d5bae977ba38c1e93801ec4e6d91276161f7f5
      (Earnie Boyd)
   4. [git push mingw-get]Repository: mingw-get branch, master,
      updated. r0-5-beta-20120426-1-113-g7e933e4 (Keith Marshall)


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

Message: 1
Date: Tue, 25 Jun 2013 20:36:57 +0000
From: "Keith Marshall" <noreply@sourceforge.net>
Subject: [MinGW-cvs] [git push mingw-org-wsl]Repository: mingw-org-wsl
	branch, 4.0-dev, updated. 22068f31e7e2118d462387e1f27c806eba76ac5f
To: mingw-cvs@lists.sourceforge.net
Message-ID:
	<mailman.74008.1372363572.12996.mingw-cvs@lists.sourceforge.net>

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  22068f31e7e2118d462387e1f27c806eba76ac5f (commit)
      from  f67fa09f32d01c6776511836206330b855178fff (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/22068f31e7e2118d462387e1f27c806eba76ac5f/

commit 22068f31e7e2118d462387e1f27c806eba76ac5f
Author: Keith Marshall <keithmarshall@users.sourceforge.net>
Date:   Tue Jun 25 21:36:44 2013 +0100

    Correct ill advised use of non-standard shell syntax.

diff --git a/ChangeLog b/ChangeLog
index 7bee564..857a157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-25  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+	Correct ill advised use of non-standard shell syntax.
+
+	* Makefile.in (lib%.a): Remove bash/ksh/csh style logic construct;
+	replace it using standard Bourne shell "test" command syntax.
+
 2013-06-21  Mark Brand  <mabrand@mabrand.nl>
 
 	* include/time.h: Correct typecasts throughout.
diff --git a/Makefile.in b/Makefile.in
index bde26c3..4356628 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -724,12 +724,12 @@ lib%.a: %.def
 	V=`echo $@ | sed -e 's|lib\([a-z]*\)\([0-9]*\).*|\2|'`; \
 	DLLNAME="$${N}$${V}.dll"; \
 	$(DLLTOOL) $(DLLTOOL_FLAGS) $${DLLNAME} --def $< --output-lib $@ ; \
-	if [[ $${DLLNAME} = msvcrt.dll || \
-	      $${DLLNAME} = msvcrtd.dll || \
-	      $${DLLNAME} = msvcr70.dll || \
-	      $${DLLNAME} = msvcr70d.dll || \
-	      $${DLLNAME} = msvcr71.dll || \
-	      $${DLLNAME} = msvcr71d.dll ]]; then \
+	if test $${DLLNAME} = msvcrt.dll  \
+	    -o  $${DLLNAME} = msvcrtd.dll  \
+	    -o  $${DLLNAME} = msvcr70.dll  \
+	    -o  $${DLLNAME} = msvcr70d.dll  \
+	    -o  $${DLLNAME} = msvcr71.dll  \
+	    -o  $${DLLNAME} = msvcr71d.dll; then \
 	  $(AR) rc $@ src/libcrt/crt/ofmt_stub.o; \
 	fi
 	$(RANLIB) $@

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

Summary of changes:
 ChangeLog   |    7 +++++++
 Makefile.in |   12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)


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



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

Message: 2
Date: Thu, 27 Jun 2013 12:08:27 +0000
From: "Earnie Boyd" <noreply@sourceforge.net>
Subject: [MinGW-cvs] [git push mingw-org-wsl]Repository: mingw-org-wsl
	branch, 4.0-dev, updated. 2e1e5c90e5078ebcfa6c51271706e49b934b9a86
To: mingw-cvs@lists.sourceforge.net
Message-ID:
	<mailman.74009.1372363572.12996.mingw-cvs@lists.sourceforge.net>

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  2e1e5c90e5078ebcfa6c51271706e49b934b9a86 (commit)
       via  2e52c40a3bf2b76d8b23d14901feadc3fe9c3181 (commit)
      from  22068f31e7e2118d462387e1f27c806eba76ac5f (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/2e1e5c90e5078ebcfa6c51271706e49b934b9a86/

commit 2e1e5c90e5078ebcfa6c51271706e49b934b9a86
Merge: 2e52c40 22068f3
Author: Earnie Boyd <earnie@users.sourceforge.net>
Date:   Thu Jun 27 08:06:58 2013 -0400

    Resolve issue to define all components of _STAT_DEFINED.

diff --cc ChangeLog
index f5d9b28,857a157..55ffc75
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,14 @@@
 +2013-06-27  Earnie Boyd  <earnie@users.sourceforge.net>
 +
 +	* include/wchar.h: Resolve issue to define all components of
- 	_STAT_DEFINED.
++	_STAT_DEFINED
++
+ 2013-06-25  Keith Marshall  <keithmarshall@users.sourceforge.net>
+ 
+ 	Correct ill advised use of non-standard shell syntax.
+ 
+ 	* Makefile.in (lib%.a): Remove bash/ksh/csh style logic construct;
+ 	replace it using standard Bourne shell "test" command syntax.
  
  2013-06-21  Mark Brand  <mabrand@mabrand.nl>
  

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

commit 2e52c40a3bf2b76d8b23d14901feadc3fe9c3181
Author: Earnie Boyd <earnie@users.sourceforge.net>
Date:   Thu Jun 27 08:03:15 2013 -0400

    Resolve issue to define all components of _STAT_DEFINED.

diff --git a/ChangeLog b/ChangeLog
index 7bee564..f5d9b28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-27  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	* include/wchar.h: Resolve issue to define all components of
+	_STAT_DEFINED.
+
 2013-06-21  Mark Brand  <mabrand@mabrand.nl>
 
 	* include/time.h: Correct typecasts throughout.
diff --git a/include/wchar.h b/include/wchar.h
index 1a1c461..87b8d84 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -598,6 +598,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	  _wrmdir (const wchar_t*);
 #define _WDIRECT_DEFINED
 #endif /* _WDIRECT_DEFINED */
 
+/* @TODO: Use sys/stat.h to define these instead of duplicated code. */
 #ifndef _STAT_DEFINED
 /*
  * The structure manipulated and returned by stat and fstat.
@@ -624,30 +625,30 @@ struct _stat32
 
 #ifndef __STRICT_ANSI__
 struct stat {
-    _dev_t  st_dev;	/* Equivalent to drive number 0=A 1=B ... */
-    _ino_t  st_ino;	/* Always zero ? */
-    _mode_t st_mode;	/* See above constants */
-    short   st_nlink;	/* Number of links. */
-    short   st_uid;	/* User: Maybe significant on NT ? */
-    short   st_gid;	/* Group: Ditto */
-    _dev_t  st_rdev;	/* Seems useless (not even filled in) */
-    _off_t  st_size;	/* File size in bytes */
-    time_t  st_atime;	/* Accessed date (always 00:00 hrs local
-			 * on FAT) */
-    time_t  st_mtime;	/* Modified time */
-    time_t  st_ctime;	/* Creation time */
-} ;
+	_dev_t	   st_dev;	/* Equivalent to drive number 0=A 1=B ... */
+	_ino_t	   st_ino;	/* Always zero ? */
+	_mode_t    st_mode;	/* See above constants */
+	short	   st_nlink;	/* Number of links. */
+	short	   st_uid;	/* User: Maybe significant on NT ? */
+	short	   st_gid;	/* Group: Ditto */
+	_dev_t	   st_rdev;	/* Seems useless (not even filled in) */
+	_off_t	   st_size;	/* File size in bytes */
+	time_t	   st_atime;	/* Accessed date (always 00:00 hrs local
+				 * on FAT) */
+	time_t	   st_mtime;	/* Modified time */
+	time_t	   st_ctime;	/* Creation time */
+};
 #endif /* __STRICT_ANSI__ */
 
 struct _stat64 {
-	dev_t	st_dev;		/* Equivalent to drive number 0=A 1=B ... */
-	ino_t	st_ino;		/* Always zero ? */
-	mode_t	st_mode;	/* See above constants */
-	short	st_nlink;	/* Number of links. */
-	short	st_uid;		/* User: Maybe significant on NT ? */
-	short	st_gid;		/* Group: Ditto */
-	dev_t	st_rdev;	/* Seems useless (not even filled in) */
-	_off64_t st_size;	/* File size in bytes */
+	dev_t	   st_dev;	/* Equivalent to drive number 0=A 1=B ... */
+	ino_t	   st_ino;	/* Always zero ? */
+	mode_t	   st_mode;	/* See above constants */
+	short	   st_nlink;	/* Number of links. */
+	short	   st_uid;	/* User: Maybe significant on NT ? */
+	short	   st_gid;	/* Group: Ditto */
+	dev_t	   st_rdev;	/* Seems useless (not even filled in) */
+	_off64_t   st_size;	/* File size in bytes */
 	__time64_t st_atime;	/* Accessed date (always 00:00 hrs local
 				 * on FAT) */
 	__time64_t st_mtime;	/* Modified time */
@@ -666,7 +667,7 @@ struct _stat32i64 {
 	__time32_t	st_atime;
 	__time32_t	st_mtime;
 	__time32_t	st_ctime;
-} ;
+};
 
 struct _stat64i32 {
 	_dev_t		st_dev;
@@ -682,20 +683,124 @@ struct _stat64i32 {
 	__time64_t	st_ctime;
 };
 
+/* _stat32 does not exist in MSVCRT.DLL */
+_CRTIMP int __cdecl __MINGW_NOTHROW _stat (const char*, struct _stat32*);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _stat32 (const char* _v1, struct _stat32* _v2) \
{ +  return _stat(_v1, _v2);
+}
+
+_CRTIMP int __cdecl __MINGW_NOTHROW _stat64 (const char*, struct _stat64*);
+int __cdecl __MINGW_NOTHROW _stat32i64 (const char*, struct _stat32i64*);
+int __cdecl __MINGW_NOTHROW _stat64i32 (const char*, struct _stat64i32*);
+
+/* _fstat32 does not exist in MSVCRT.DLL */
+_CRTIMP int __cdecl __MINGW_NOTHROW _fstat (int, struct _stat32*);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _fstat32 (int _v1, struct _stat32* _v2) {
+    return _fstat(_v1, _v2);
+}
+
+_CRTIMP int __cdecl __MINGW_NOTHROW _fstat64 (int, struct _stat64*);
+int __cdecl __MINGW_NOTHROW _fstat32i64 (int, struct _stat32i64*);
+int __cdecl __MINGW_NOTHROW _fstat64i32 (int, struct _stat64i32*);
+
+__CRT_MAYBE_INLINE int __cdecl _fstat64i32(int desc, struct _stat64i32 *_stat) {
+  struct _stat64 st;
+  int ret = _fstat64(desc, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat64i32));
+    return -1;
+  }
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+__CRT_MAYBE_INLINE int __cdecl _fstat32i64(int desc, struct _stat32i64 *_stat) {
+  struct _stat32 st;
+  int ret = _fstat32(desc, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat32i64));
+    return -1;
+  }
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+__CRT_MAYBE_INLINE int __cdecl _stat64i32(const char *fname, struct _stat64i32 \
*_stat) { +  struct _stat64 st;
+  int ret = _stat64(fname, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat64i32));
+    return -1;
+  }
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+__CRT_MAYBE_INLINE int __cdecl _stat32i64(const char *fname, struct _stat32i64 \
*_stat) { +  struct _stat32 st;
+  int ret = _stat32(fname, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat32i64));
+    return -1;
+  }
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+
 #define __stat64 _stat64
 #if defined(_USE_32BIT_TIME_T)
 #define _fstat      _fstat32
 #define _fstati64   _fstat32i64
 #define _stat       _stat32
 #define _stati64    _stat32i64
-#else  /* ! _USE_32BIT_TIME_T */
+
+#else  /* !_USE_32BIT_TIME_T */
 #define _fstat      _fstat64i32
 #define _fstati64   _fstat64
 #define _stat       _stat64i32
 #define _stati64    _stat64
+
 #endif /* _USE_32BIT_TIME_T */
 #define _STAT_DEFINED
-#endif /* ! _STAT_DEFINED */
+
+#endif /* _STAT_DEFINED */
 
 #if !defined ( _WSTAT_DEFINED) /* also declared in sys/stat.h */
 /* _wstat32 does not exist in MSVCRT.DLL */

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

Summary of changes:
 ChangeLog       |    5 ++
 include/wchar.h |  153 ++++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 134 insertions(+), 24 deletions(-)


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



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

Message: 3
Date: Thu, 27 Jun 2013 16:04:24 +0000
From: "Earnie Boyd" <noreply@sourceforge.net>
Subject: [MinGW-cvs] [git push mingw-org-wsl]Repository: mingw-org-wsl
	branch, 4.0-dev, updated. c9d5bae977ba38c1e93801ec4e6d91276161f7f5
To: mingw-cvs@lists.sourceforge.net
Message-ID:
	<mailman.74010.1372363572.12996.mingw-cvs@lists.sourceforge.net>

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  c9d5bae977ba38c1e93801ec4e6d91276161f7f5 (commit)
      from  2e1e5c90e5078ebcfa6c51271706e49b934b9a86 (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/c9d5bae977ba38c1e93801ec4e6d91276161f7f5/

commit c9d5bae977ba38c1e93801ec4e6d91276161f7f5
Author: Earnie Boyd <earnie@users.sourceforge.net>
Date:   Thu Jun 27 12:03:28 2013 -0400

    Change string to mingw_org_wsl for package name consistency and to be repository \
name nescient.

diff --git a/ChangeLog b/ChangeLog
index 55ffc75..67bb146 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* include/wchar.h: Resolve issue to define all components of
 	_STAT_DEFINED
+	* Makefile.in (mingw.org-wsl): Change string to mingw_org_wsl for
+	package name consistency and to be repository name nescient.
+	* README (mingw.org-wsl): Ditto
 
 2013-06-25  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
diff --git a/Makefile.in b/Makefile.in
index 4356628..0314737 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1072,8 +1072,8 @@ endif
 
 dist-mingwrt-src:
 ifeq ($(RELEASE_STATUS),prod)
-	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw.org-wsl
-	cd $(DESTDIR)$(prefix)/mingw.org-wsl ; \
+	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw_org_wsl
+	cd $(DESTDIR)$(prefix)/mingw_org_wsl ; \
 	rm -rf .git autom4te.cache ; \
 	rm -f config.log config.status config.cache config.h ; \
 	rm -f .gitignore core a.out Makefile ; \
@@ -1083,11 +1083,11 @@ ifeq ($(RELEASE_STATUS),prod)
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
 	rm -rf mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
-	mv mingw.org-wsl mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
+	mv mingw_org_wsl mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
 	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src.tar.lzma \
mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src  else
-	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw.org-wsl
-	cd $(DESTDIR)$(prefix)/mingw.org-wsl ; \
+	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw_org_wsl
+	cd $(DESTDIR)$(prefix)/mingw_org_wsl ; \
 	rm -rf .git autom4te.cache ; \
 	rm -f config.log config.status config.cache config.h ; \
 	rm -f .gitignore core a.out Makefile ; \
@@ -1097,7 +1097,7 @@ else
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
 	rm -rf mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
                ; \
-	mv mingw.org-wsl mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
; \ +	mv mingw_org_wsl \
mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
; \  tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma \
mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
  endif
 
@@ -1270,8 +1270,8 @@ endif
 
 dist-w32api-src:
 ifeq ($(RELEASE_STATUS),prod)
-	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw.org-wsl
-	cd $(DESTDIR)$(prefix)/mingw.org-wsl ; \
+	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw_org_wsl
+	cd $(DESTDIR)$(prefix)/mingw_org_wsl ; \
 	rm -rf .git autom4te.cache ; \
 	rm -f config.log config.status config.cache config.h ; \
 	rm -f .gitignore core a.out Makefile ; \
@@ -1281,11 +1281,11 @@ ifeq ($(RELEASE_STATUS),prod)
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
 	rm -rf w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
-	mv mingw.org-wsl w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
+	mv mingw_org_wsl w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
 	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src.tar.lzma \
w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src  else
-	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw.org-wsl
-	cd $(DESTDIR)$(prefix)/mingw.org-wsl ; \
+	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw_org_wsl
+	cd $(DESTDIR)$(prefix)/mingw_org_wsl ; \
 	rm -rf .git autom4te.cache ; \
 	rm -f config.log config.status config.cache config.h ; \
 	rm -f .gitignore core a.out Makefile ; \
@@ -1295,7 +1295,7 @@ else
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
 	rm -rf w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
                ; \
-	mv mingw.org-wsl w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
; \ +	mv mingw_org_wsl \
w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
; \  tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma \
w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
  endif
 
@@ -1359,43 +1359,43 @@ dist-wsl-install: all dist-wsl-mkdir
 dist-wsl-dll: dist-wsl-install
 ifeq ($(RELEASE_STATUS),prod)
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dll.tar.lzma \
bin/*.dll ; +	tar acf \
../packages/mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dll.tar.lzma \
bin/*.dll ;  else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dll.tar.lzma \
bin/*.dll ; +	tar acf \
../packages/$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dll.tar.lzma \
bin/*.dll ;  endif
 
 dist-wsl-dev: dist-wsl-install
 ifeq ($(RELEASE_STATUS),prod)
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dev.tar.lzma \
include/ lib/ +	tar acf \
../packages/$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dev.tar.lzma \
include/ lib/  else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma \
include/ lib/ +	tar acf \
../packages/$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma \
include/ lib/  endif
 
 dist-wsl-lic: dist-wsl-install
 ifeq ($(RELEASE_STATUS),prod)
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-lic.tar.lzma \
share/doc/mingw.org-wsl/LICENSE +	tar acf \
../packages/mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-lic.tar.lzma \
share/doc/mingw_org_wsl/LICENSE  else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma \
share/doc/mingw.org-wsl/LICENSE +	tar acf \
../packages/$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma \
share/doc/mingw_org_wsl/LICENSE  endif
 
 dist-wsl-doc: dist-wsl-install
 ifeq ($(RELEASE_STATUS),prod)
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-doc.tar.lzma \
share/doc/mingw.org-wsl/README +	tar acf \
../packages/mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-doc.tar.lzma \
share/doc/mingw_org_wsl/README  else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma \
share/doc/mingw.org-wsl/README +	tar acf \
../packages/$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma \
share/doc/mingw_org_wsl/README  endif
 
 dist-wsl-src: dist-wsl-install
 ifeq ($(RELEASE_STATUS),prod)
-	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw.org-wsl
-	cd $(DESTDIR)$(prefix)/mingw.org-wsl ; \
+	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw_org_wsl
+	cd $(DESTDIR)$(prefix)/mingw_org_wsl ; \
 	rm -rf .git autom4te.cache ; \
 	rm -f config.log config.status config.cache config.h ; \
 	rm -f .gitignore core a.out Makefile ; \
@@ -1404,12 +1404,12 @@ ifeq ($(RELEASE_STATUS),prod)
 	find . -type f -name \*.bak -delete ; \
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
-	rm -rf mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
-	mv mingw.org-wsl mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \
                \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src.tar.lzma \
mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src +	rm -rf \
mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \ +	mv \
mingw_org_wsl mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src ; \ \
+	tar acf ../packages/mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src.tar.lzma \
mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-src  else
-	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw.org-wsl
-	cd $(DESTDIR)$(prefix)/mingw.org-wsl ; \
+	cp -af $(top_srcdir) $(DESTDIR)$(prefix)/mingw_org_wsl
+	cd $(DESTDIR)$(prefix)/mingw_org_wsl ; \
 	rm -rf .git autom4te.cache ; \
 	rm -f config.log config.status config.cache config.h ; \
 	rm -f .gitignore core a.out Makefile ; \
@@ -1418,9 +1418,9 @@ else
 	find . -type f -name \*.bak -delete ; \
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
-	rm -rf $(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
                ; \
-	mv mingw.org-wsl $(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
                ; \
-	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma \
$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
 +	rm -rf $(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
; \ +	mv mingw_org_wsl \
$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src \
; \ +	tar acf ../packages/$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma \
$(RELEASE_STATUS)_mingw_org_wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
  endif
 
 clean-dist: clean-dist-mingwrt clean-dist-w32api clean-dist-wsl
diff --git a/README b/README
index ab54b01..d89d0ff 100644
--- a/README
+++ b/README
@@ -21,7 +21,7 @@
 ; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 ; DEALINGS IN THE SOFTWARE.
 ;;
-mingw.org-wsl (Windows System Libraries):
+mingw-org-wsl (Windows System Libraries):
 =====
 This package contains both the C Runtime (libcrt) and the Windows API (winapi)
 definitions as provided by the MinGW.org team.  These libraries can be used

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

Summary of changes:
 ChangeLog   |    3 ++
 Makefile.in |   60 +++++++++++++++++++++++++++++-----------------------------
 README      |    2 +-
 3 files changed, 34 insertions(+), 31 deletions(-)


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



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

Message: 4
Date: Thu, 27 Jun 2013 20:06:08 +0000
From: "Keith Marshall" <noreply@sourceforge.net>
Subject: [MinGW-cvs] [git push mingw-get]Repository: mingw-get branch,
	master,	updated. r0-5-beta-20120426-1-113-g7e933e4
To: mingw-cvs@lists.sourceforge.net
Message-ID:
	<mailman.74011.1372363572.12996.mingw-cvs@lists.sourceforge.net>

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-get".

The branch, master has been updated
       via  7e933e48cf5a720db978449eaa8b910c83dc93cf (commit)
      from  b4e3507baed9e13b5aab6a682251c922aab3b99f (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-get/ci/7e933e48cf5a720db978449eaa8b910c83dc93cf/

commit 7e933e48cf5a720db978449eaa8b910c83dc93cf
Author: Keith Marshall <keithmarshall@users.sourceforge.net>
Date:   Thu Jun 27 16:50:26 2013 +0100

    Improve diagnostics for tar archive processing faults.

diff --git a/ChangeLog b/ChangeLog
index 1372d29..3409db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2013-06-27  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+	Improve diagnostics for tar archive processing faults.
+
+	* src/pkgproc.h (TAR_ARCHIVE_FORMAT_ERROR): New constant; define it.
+	(TAR_ARCHIVE_DATA_READ_ERROR, TAR_ARCHIVE_DATA_WRITE_ERROR): Likewise.
+
+	* src/tarproc.cpp (dmh_notify_archive_data_exhausted): New static
+	inline function; implement it.
+	(pkgTarArchiveProcessor::GetArchiveEntry) [short header]: Use it.
+	(pkgArchiveProcessor::ExtractFile) [TAR_ARCHIVE_DATA_READ_ERROR]:
+	Likewise, use it here; also explicitlycheck for, and diagnose...
+	[TAR_ARCHIVE_DATA_WRITE_ERROR]: ...this; also add a further catch all
+	case, to diagnose any other unexpected condition.
+	(pkgTarArchiveProcessor::GetArchiveEntry) [bad checksum]: Diagnose it.
+	(pkgTarArchiveProcessor::Process): Return appropriate status codes.
+	(pkgTarArchiveProcessor::ProcessEntityData): Likewise.
+
 2013-06-24  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
 	Facilitate version synchronisation for mingw-get-setup.
diff --git a/src/pkgproc.h b/src/pkgproc.h
index 9d104ad..964d8d7 100644
--- a/src/pkgproc.h
+++ b/src/pkgproc.h
@@ -137,7 +137,7 @@ union tar_archive_header
  */
 #define TAR_ENTITY_TYPE_FILE		'0'
 #define TAR_ENTITY_TYPE_LINK		'1'
-#define TAR_ENTITY_TYPE_SYMLINK		'2'
+#define TAR_ENTITY_TYPE_SYMLINK 	'2'
 #define TAR_ENTITY_TYPE_CHRDEV		'3'
 #define TAR_ENTITY_TYPE_BLKDEV		'4'
 #define TAR_ENTITY_TYPE_DIRECTORY	'5'
@@ -146,7 +146,13 @@ union tar_archive_header
 /* Some older style tar archives may use '\0' as an alternative to '0',
  * to identify an archive entry representing a regular file.
  */
-#define TAR_ENTITY_TYPE_ALTFILE		'\0'
+#define TAR_ENTITY_TYPE_ALTFILE 	'\0'
+
+/* Specify classification codes for tar archive processing errors.
+ */
+#define TAR_ARCHIVE_DATA_READ_ERROR	-1
+#define TAR_ARCHIVE_DATA_WRITE_ERROR	-2
+#define TAR_ARCHIVE_FORMAT_ERROR	-3
 
 class pkgTarArchiveProcessor : public pkgArchiveProcessor
 {
diff --git a/src/tarproc.cpp b/src/tarproc.cpp
index eef9e3a..800d94f 100644
--- a/src/tarproc.cpp
+++ b/src/tarproc.cpp
@@ -68,6 +68,15 @@ int pkgArchiveProcessor::CreateExtractionDirectory( const char \
*pathname )  return status;
 }
 
+static inline int dmh_notify_archive_data_exhausted( const char *context )
+{
+  /* Helper function to emit "premature end of archive" diagnostics.
+   */
+  return dmh_notify( DMH_ERROR,
+      "unexpected end of archive reading %s record\n", context
+    );
+}
+
 inline int pkgArchiveProcessor::SetOutputStream( const char *name, int mode )
 {
   /* Wrapper method to facilitate the set up of output streams
@@ -98,6 +107,19 @@ int pkgArchiveProcessor::ExtractFile( int fd, const char \
                *pathname, int status )
        */
       unlink( pathname );
       dmh_notify( DMH_ERROR, "%s: extraction failed\n", pathname );
+      switch( status )
+      {
+	case TAR_ARCHIVE_DATA_READ_ERROR:
+	  dmh_notify_archive_data_exhausted( "content" );
+	  break;
+
+	case TAR_ARCHIVE_DATA_WRITE_ERROR:
+	  dmh_notify( DMH_ERROR, "write error extracting file content\n" );
+	  break;
+
+	default:
+	  dmh_notify( DMH_ERROR, "unexpected fault; status = %d\n", status );
+      }
     }
   }
   /* Finally, we pass the original status value back to the caller.
@@ -249,9 +271,10 @@ int pkgTarArchiveProcessor::GetArchiveEntry()
 
   if( count < sizeof( header ) )
   {
-    /* Failed to read a complete header; return error code.
+    /* Failed to read a complete header; diagnose and return error code.
      */
-    return -1;
+    dmh_notify_archive_data_exhausted( "header" );
+    return TAR_ARCHIVE_DATA_READ_ERROR;
   }
 
   while( count-- )
@@ -280,9 +303,16 @@ int pkgTarArchiveProcessor::GetArchiveEntry()
       }
       /* After computing the checksum for a non-zero header,
        * verify it against the value recorded in the checksum field;
-       * return +1 for a successful match, or -2 for failure.
+       * return +1 for a successful match...
+       */
+      if( sum == octval( header.field.chksum ) )
+       	return 1;
+
+      /* ...otherwise diagnose checksum validation failure, and
+       * return the fault status.
        */
-      return (sum == octval( header.field.chksum )) ? 1 : -2;
+      dmh_notify( DMH_ERROR, "checksum validation failed\n" );
+      return TAR_ARCHIVE_FORMAT_ERROR;
     }
 
   /* If we get to here, then the inner loop was never entered;
@@ -297,7 +327,8 @@ int pkgTarArchiveProcessor::Process()
   /* Generic method for reading tar archives, and extracting their
    * content; loops over each archive entry in turn...
    */
-  while( GetArchiveEntry() > 0 )
+  int status;
+  while( (status = GetArchiveEntry()) > 0 )
   {
     char *prefix = *header.field.prefix ? header.field.prefix : NULL;
     char *name = header.field.name;
@@ -312,14 +343,19 @@ int pkgTarArchiveProcessor::Process()
     {
       /* Extract the full pathname from the data of this entry.
        */
-      longname = EntityDataAsString();
-      if( !longname )
+      if( (longname = EntityDataAsString()) == NULL )
+      {
         dmh_notify( DMH_ERROR, "Unable to read a long name entry\n" );
+	return TAR_ARCHIVE_FORMAT_ERROR;
+      }
 
       /* Read the entry for which this long name is intended.
        */
       if( GetArchiveEntry() <= 0 )
+      {
         dmh_notify( DMH_ERROR, "Expected a new entry after a long name entry\n" );
+	return TAR_ARCHIVE_FORMAT_ERROR;
+      }
 
       /* Use the previously determined long name as the pathname for this entry.
        */
@@ -448,7 +484,7 @@ int pkgTarArchiveProcessor::ProcessEntityData( int fd )
        * Failure to fully populate the transfer buffer, (i.e. a short
        * read), indicates a corrupt archive; bail out immediately.
        */
-      return -1;
+      return TAR_ARCHIVE_DATA_READ_ERROR;
 
     /* When the number of actual data bytes expected is fewer than the
      * total number of bytes in the transfer buffer...
@@ -470,7 +506,7 @@ int pkgTarArchiveProcessor::ProcessEntityData( int fd )
        * An extraction error occurred; set the status code to
        * indicate failure.
        */
-      status = -2;
+      status = TAR_ARCHIVE_DATA_WRITE_ERROR;
 
     /* Adjust the count of remaining unprocessed data bytes, and begin
      * a new processing cycle, to capture any which may be present.

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

Summary of changes:
 ChangeLog       |   18 ++++++++++++++++++
 src/pkgproc.h   |   10 ++++++++--
 src/tarproc.cpp |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 71 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Repository: mingw-get



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

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev

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

_______________________________________________
MinGW-cvs mailing list
MinGW-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-cvs


End of MinGW-cvs Digest, Vol 62, Issue 6
****************************************


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic