bin/128616: [patch] bsdtar(1) error message typo

Jaakko Heinonen jh at saunalahti.fi
Wed Nov 5 11:30:09 PST 2008


>Number:         128616
>Category:       bin
>Synopsis:       [patch] bsdtar(1) error message typo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>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:
>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:
>Unformatted:


More information about the freebsd-bugs mailing list