From owner-svn-src-all@FreeBSD.ORG Sun Feb 8 22:04:17 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFB40106566B; Sun, 8 Feb 2009 22:04:17 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ADA3F8FC13; Sun, 8 Feb 2009 22:04:17 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n18M4HEi035991; Sun, 8 Feb 2009 22:04:17 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n18M4Hw5035990; Sun, 8 Feb 2009 22:04:17 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200902082204.n18M4Hw5035990@svn.freebsd.org> From: Tim Kientzle Date: Sun, 8 Feb 2009 22:04:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188344 - head/usr.bin/tar X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Feb 2009 22:04:18 -0000 Author: kientzle Date: Sun Feb 8 22:04:17 2009 New Revision: 188344 URL: http://svn.freebsd.org/changeset/base/188344 Log: Fix multiple -s options. MFC after: 7 days Modified: head/usr.bin/tar/subst.c Modified: head/usr.bin/tar/subst.c ============================================================================== --- head/usr.bin/tar/subst.c Sun Feb 8 22:02:46 2009 (r188343) +++ head/usr.bin/tar/subst.c Sun Feb 8 22:04:17 2009 (r188344) @@ -202,7 +202,7 @@ apply_substitution(struct bsdtar *bsdtar if (symlink_only && !rule->symlink) continue; if (regexec(&rule->re, name, 10, matches, 0)) - break; + continue; got_match = 1; print_match |= rule->print;