[setup] branch master, updated. release_2.870-9-g0c75648

[jturney@sourceware.org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=0c7564874d74ecbf410edb7165a26595f53a03f5

commit 0c7564874d74ecbf410edb7165a26595f53a03f5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date:   Tue Mar 3 12:40:00 2015 +0000

    Silently ignore 'x' and 'g' type tar extended headers
    
    Silently ignore 'g' and 'x' type tar extended headers, rather than warning about
    "unknown (or unsupported) file type 'x'".
    
    It seems that base-files has an 'x' extended header for each file, apparently to
    store the mtime.
    
    	* archive_tar.cc (next_file_name): Silence error for 'g' and 'x'
    	type headers.


Diff:
---
 ChangeLog      |    5 +++++
 archive_tar.cc |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4238b3c..d182896 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-03-04  Jon TURNEY  <jon.turney@dronecode.org.uk>
 
+	* archive_tar.cc (next_file_name): Silence error for 'g' and 'x'
+	type headers.
+
+2015-03-04  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
 	* archive_tar.cc (archive_tar): Convert from fprintf(stderr, ...)
 	to LogBabblePrintf() or LogPlainPrintf() as appropriate.
 
diff --git a/archive_tar.cc b/archive_tar.cc
index 57c3a8d..a07756e 100644
--- a/archive_tar.cc
+++ b/archive_tar.cc
@@ -233,6 +233,9 @@ archive_tar::next_file_name ()
       LogPlainPrintf ("error: unknown (or unsupported) file type `%c'\n",
                       state.tar_header.typeflag);
       err++;
+      /* fall through */
+    case 'g':			/* POSIX.1-2001 global extended header */
+    case 'x':			/* POSIX.1-2001 extended header */
       skip_file ();
       return next_file_name ();
     }