From owner-cvs-src-old@FreeBSD.ORG Sun Apr 11 18:44:56 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FDF2106566B for ; Sun, 11 Apr 2010 18:44:56 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DA228FC1B for ; Sun, 11 Apr 2010 18:44:56 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3BIiud8085474 for ; Sun, 11 Apr 2010 18:44:56 GMT (envelope-from kientzle@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3BIiuZg085473 for cvs-src-old@freebsd.org; Sun, 11 Apr 2010 18:44:56 GMT (envelope-from kientzle@repoman.freebsd.org) Message-Id: <201004111844.o3BIiuZg085473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to kientzle@repoman.freebsd.org using -f From: Tim Kientzle Date: Sun, 11 Apr 2010 18:44:42 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.bin/tar matching.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2010 18:44:56 -0000 kientzle 2010-04-11 18:44:42 UTC FreeBSD src repository Modified files: usr.bin/tar matching.c Log: SVN rev 206487 on 2010-04-11 18:44:42Z by kientzle If a file is specifically both included and excluded, then: * It is not extracted (because it is excluded) * If it's not present in the archive, then an error is reported (because the file was requested and not found) * If it is present in the archive, no error is reported. Previously, this would always report an error because the exclusion prevented the entry from matching the inclusion. Also, tar is now more reluctant to report unmatched inclusions. Previously, "tar x file1 'file*'" against an archive that contained a single entry "file1" would match file1 and then report an error for the second pattern because it wasn't matched. It now considers both inclusions to be matched and reports no error. Revision Changes Path 1.21 +26 -25 src/usr.bin/tar/matching.c