Create test_option_s to exercise basic -s handling.

In particular, add some checks for multiple -s options in order
to verify a bug reported where multiple -s options have no effect.

A bad typo was causing the substitution-matching loop to always exit
after checking the first match.

Fixed.

Thanks to Wayne Marshall for reporting this problem.

SVN-Revision: 354

diff --git a/tar/subst.c b/tar/subst.c
index 1c32fb0752b5c1be417c4a6655d2fc0557fbd63c..9e864984b471f725c2776294cee37f9676dff1a9 100644 (file)
--- a/tar/subst.c
+++ b/tar/subst.c
@@ -202,7 +202,7 @@ apply_substitution(struct bsdtar *bsdtar, const char *name, char **result, int s
                if (symlink_only && !rule->symlink)
                        continue;
                if (regexec(&rule->re, name, 10, matches, 0))
-                       break;
+                       continue;
 
                got_match = 1;
                print_match |= rule->print;

diff --git a/tar/test/Makefile b/tar/test/Makefile
index d687e16f2de4553621cfb6c0972f69eefa57af5f..f668fe47226028c0c8073102eea47389ab3bad0d 100644 (file)
--- a/tar/test/Makefile
+++ b/tar/test/Makefile
@@ -16,6 +16,7 @@ TESTS=        \
        test_help.c                             \
        test_option_T.c                         \
        test_option_q.c                         \
+       test_option_s.c                         \
        test_patterns.c                         \
        test_stdio.c                            \
        test_strip_components.c                 \

diff --git a/tar/test/test_option_s.c b/tar/test/test_option_s.c
new file mode 100644 (file)
index 0000000..78cdeb2
--- /dev/null
+++ b/tar/test/test_option_s.c
@@ -0,0 +1,95 @@
+/*-
+ * Copyright (c) 2003-2008 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_option_T.c,v 1.3 2008/08/15 06:12:02 kientzle Exp $");
+
+static int
+mkfile(const char *fn, const char *contents)
+{
+       int fd = open(fn, O_RDWR | O_CREAT, 0644);
+       failure("Couldn't create file '%s', fd=%d, errno=%d (%s)\n",
+           fn, fd, errno, strerror(errno));
+       if (!assert(fd > 0))
+               return (1); /* Failure. */
+       if (contents != NULL)
+               assertEqualInt(strlen(contents),
+                   write(fd, contents, strlen(contents)));
+       assertEqualInt(0, close(fd));
+       return (0); /* Success */
+}
+
+DEFINE_TEST(test_option_s)
+{
+       /* Create a sample file heirarchy. */
+       assertEqualInt(0, mkdir("in", 0755));
+       assertEqualInt(0, mkdir("in/d1", 0755));
+       assertEqualInt(0, mkfile("in/d1/foo", "foo"));
+       assertEqualInt(0, mkfile("in/d1/bar", "bar"));
+
+       /*
+        * Test 1: Filename substitution when creating archives.
+        */
+       assertEqualInt(0, mkdir("test1", 0755));
+       systemf("%s -cf - -s /foo/bar/ in/d1/foo | %s -xf - -C test1",
+           testprog, testprog);
+       assertFileContents("foo", 3, "test1/in/d1/bar");
+       systemf("%s -cf - -s /d1/d2/ in/d1/foo | %s -xf - -C test1",
+           testprog, testprog);
+       assertFileContents("foo", 3, "test1/in/d2/foo");
+
+
+       /*
+        * Test 2: Basic substitution when extracting archive.
+        */
+       assertEqualInt(0, mkdir("test2", 0755));
+       systemf("%s -cf - in/d1/foo | %s -xf - -s /foo/bar/ -C test2",
+           testprog, testprog);
+       assertFileContents("foo", 3, "test2/in/d1/bar");
+
+       /*
+        * Test 3: Files with empty names shouldn't be archived.
+        */
+       systemf("%s -cf - -s ,in/d1/foo,, in/d1/foo | %s -tvf - > in.lst",
+           testprog, testprog);
+       assertEmptyFile("in.lst");
+
+       /*
+        * Test 4: Multiple substitutions when extracting archive.
+        */
+       assertEqualInt(0, mkdir("test4", 0755));
+       systemf("%s -cf - in/d1/foo in/d1/bar | %s -xf - -s /foo/bar/ -s }bar}baz} -C test4",
+           testprog, testprog);
+       assertFileContents("foo", 3, "test4/in/d1/bar");
+       assertFileContents("bar", 3, "test4/in/d1/baz");
+
+       /*
+        * Test 5: Name-switching substitutions when extracting archive.
+        */
+       assertEqualInt(0, mkdir("test5", 0755));
+       systemf("%s -cf - in/d1/foo in/d1/bar | %s -xf - -s /foo/bar/ -s }bar}foo} -C test5",
+           testprog, testprog);
+       assertFileContents("foo", 3, "test5/in/d1/bar");
+       assertFileContents("bar", 3, "test5/in/d1/foo");
+}