From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 79278 invoked by alias); 13 Mar 2015 12:32:03 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 79259 invoked by uid 9795); 13 Mar 2015 12:32:03 -0000 Date: Fri, 13 Mar 2015 12:32:00 -0000 Message-ID: <20150313123203.79233.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup] branch master, updated. release_2.870-9-g0c75648 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 517df8cb7d3c81d24db3804060b34efcdca0d12d X-Git-Newrev: 0c7564874d74ecbf410edb7165a26595f53a03f5 X-SW-Source: 2015-q1/txt/msg00042.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=0c7564874d74ecbf410edb7165a26595f53a03f5 commit 0c7564874d74ecbf410edb7165a26595f53a03f5 Author: Jon TURNEY 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 + * archive_tar.cc (next_file_name): Silence error for 'g' and 'x' + type headers. + +2015-03-04 Jon TURNEY + * 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 (); }