From jaakko@saunalahti.fi  Wed Nov  5 19:29:36 2008
Return-Path: <jaakko@saunalahti.fi>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49C42106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Nov 2008 19:29:36 +0000 (UTC)
	(envelope-from jaakko@saunalahti.fi)
Received: from gw02.mail.saunalahti.fi (gw02.mail.saunalahti.fi [195.197.172.116])
	by mx1.freebsd.org (Postfix) with ESMTP id 0484B8FC1D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Nov 2008 19:29:35 +0000 (UTC)
	(envelope-from jaakko@saunalahti.fi)
Received: from ws64.jh.dy.fi (a91-153-122-179.elisa-laajakaista.fi [91.153.122.179])
	by gw02.mail.saunalahti.fi (Postfix) with ESMTP id 0004113948E
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Nov 2008 21:29:33 +0200 (EET)
Received: from ws64.jh.dy.fi (localhost [127.0.0.1])
	by ws64.jh.dy.fi (8.14.2/8.14.2) with ESMTP id mA5JTXo8012727
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 5 Nov 2008 21:29:33 +0200 (EET)
	(envelope-from jaakko@ws64.jh.dy.fi)
Received: (from jaakko@localhost)
	by ws64.jh.dy.fi (8.14.2/8.14.2/Submit) id mA5JTXXn012726;
	Wed, 5 Nov 2008 21:29:33 +0200 (EET)
	(envelope-from jaakko)
Message-Id: <200811051929.mA5JTXXn012726@ws64.jh.dy.fi>
Date: Wed, 5 Nov 2008 21:29:33 +0200 (EET)
From: Jaakko Heinonen <jh@saunalahti.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] bsdtar(1) error message typo
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         128616
>Category:       bin
>Synopsis:       [patch] bsdtar(1) error message typo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kientzle
>State:          patched
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 05 19:30:08 UTC 2008
>Closed-Date:    
>Last-Modified:  Tue Sep  7 18:40:01 UTC 2010
>Originator:     Jaakko Heinonen
>Release:        FreeBSD 8.0-CURRENT
>Organization:
>Environment:
	
>Description:
	
>How-To-Repeat:
$ tar --version
bsdtar 2.5.5 - libarchive 2.5.5
$ tar -cv -s '/dev/\9/' -f /dev/null /dev/null
tar: Invalid substituion, skipping entry
>Fix:

--- bsdtar-errmsg-typo.diff begins here ---
Index: usr.bin/tar/util.c
===================================================================
--- usr.bin/tar/util.c	(revision 183511)
+++ usr.bin/tar/util.c	(working copy)
@@ -364,7 +364,7 @@ edit_pathname(struct bsdtar *bsdtar, str
 #if HAVE_REGEX_H
 	r = apply_substitution(bsdtar, name, &subst_name, 0);
 	if (r == -1) {
-		bsdtar_warnc(bsdtar, 0, "Invalid substituion, skipping entry");
+		bsdtar_warnc(bsdtar, 0, "Invalid substitution, skipping entry");
 		return 1;
 	}
 	if (r == 1) {
@@ -380,7 +380,7 @@ edit_pathname(struct bsdtar *bsdtar, str
 	if (archive_entry_hardlink(entry)) {
 		r = apply_substitution(bsdtar, archive_entry_hardlink(entry), &subst_name, 1);
 		if (r == -1) {
-			bsdtar_warnc(bsdtar, 0, "Invalid substituion, skipping entry");
+			bsdtar_warnc(bsdtar, 0, "Invalid substitution, skipping entry");
 			return 1;
 		}
 		if (r == 1) {
@@ -391,7 +391,7 @@ edit_pathname(struct bsdtar *bsdtar, str
 	if (archive_entry_symlink(entry) != NULL) {
 		r = apply_substitution(bsdtar, archive_entry_symlink(entry), &subst_name, 1);
 		if (r == -1) {
-			bsdtar_warnc(bsdtar, 0, "Invalid substituion, skipping entry");
+			bsdtar_warnc(bsdtar, 0, "Invalid substitution, skipping entry");
 			return 1;
 		}
 		if (r == 1) {
--- bsdtar-errmsg-typo.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->kientzle 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Nov 6 09:29:10 UTC 2008 
Responsible-Changed-Why:  

Over to maintainer.

http://www.freebsd.org/cgi/query-pr.cgi?pr=128616 
State-Changed-From-To: open->patched 
State-Changed-By: kientzle 
State-Changed-When: Sat Mar 28 23:58:53 UTC 2009 
State-Changed-Why:  
Fixed in -CURRENT r186118. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128616 

From: Alexander Best <arundel@freebsd.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: bin/128616: [patch] bsdtar(1) error message typo
Date: Tue, 7 Sep 2010 18:35:06 +0000

 could you MFC these changes to stable/7 so the PR can be closed?
 
 cheers.
 alex
 
 -- 
 a13x
>Unformatted:
