* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_freebsd.c,v 1.1 2008/10/19 00:18:44 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_freebsd.c,v 1.2 2008/11/17 21:06:17 kientzle Exp $");
#if defined(__FreeBSD__) && __FreeBSD__ > 4
#include <sys/acl.h>
/* Create a test file and try to set an ACL on it. */
fd = open("pretest", O_WRONLY | O_CREAT | O_EXCL, 0777);
failure("Could not create test file?!");
- n = -1;
- if (assert(fd >= 0)) {
- n = acl_set_fd(fd, acl);
- failure("acl_set_fd(): errno = %d (%s)",
- errno, strerror(errno));
- assertEqualInt(0, n);
- close(fd);
- }
+ if (!assert(fd >= 0))
+ return;
- if (fd < 0 || n != 0) {
+ n = acl_set_fd(fd, acl);
+ if (n != 0 && errno == EOPNOTSUPP) {
+ close(fd);
skipping("ACL tests require that ACL support be enabled on the filesystem");
return;
}
+ failure("acl_set_fd(): errno = %d (%s)",
+ errno, strerror(errno));
+ assertEqualInt(0, n);
+ close(fd);
/* Create a write-to-disk object. */
assert(NULL != (a = archive_write_disk_new()));
--- /dev/null
+/*-
+ * Copyright (c) 2003-2007 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_strip_components.c,v 1.2 2008/11/10 05:24:13 kientzle Exp $");
+
+static int
+touch(const char *fn)
+{
+ 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 (0); /* Failure. */
+ close(fd);
+ return (1); /* Success */
+}
+
+DEFINE_TEST(test_strip_components)
+{
+ struct stat st;
+
+ assertEqualInt(0, mkdir("d0", 0755));
+ assertEqualInt(0, chdir("d0"));
+ assertEqualInt(0, mkdir("d1", 0755));
+ assertEqualInt(0, mkdir("d1/d2", 0755));
+ assertEqualInt(0, mkdir("d1/d2/d3", 0755));
+ assertEqualInt(1, touch("d1/d2/f1"));
+ assertEqualInt(0, link("d1/d2/f1", "l1"));
+ assertEqualInt(0, link("d1/d2/f1", "d1/l2"));
+ assertEqualInt(0, symlink("d1/d2/f1", "s1"));
+ assertEqualInt(0, symlink("d2/f1", "d1/s2"));
+ assertEqualInt(0, chdir(".."));
+
+ assertEqualInt(0, systemf("%s -cf test.tar d0", testprog));
+
+ assertEqualInt(0, mkdir("target", 0755));
+ assertEqualInt(0, systemf("%s -x -C target --strip-components 2 "
+ "-f test.tar", testprog));
+
+ failure("d0/ is too short and should not get restored");
+ assertEqualInt(-1, lstat("target/d0", &st));
+ failure("d0/d1/ is too short and should not get restored");
+ assertEqualInt(-1, lstat("target/d1", &st));
+ failure("d0/d1/s2 is a symlink to something that won't be extracted");
+ assertEqualInt(-1, stat("target/s2", &st));
+ assertEqualInt(0, lstat("target/s2", &st));
+ failure("d0/d1/d2 should be extracted");
+ assertEqualInt(0, lstat("target/d2", &st));
+
+ /*
+ * This next is a complicated case. d0/l1, d0/d1/l2, and
+ * d0/d1/d2/f1 are all hardlinks to the same file; d0/l1 can't
+ * be extracted with --strip-components=2 and the other two
+ * can. Remember that tar normally stores the first file with
+ * a body and the other as hardlink entries to the first
+ * appearance. So the final result depends on the order in
+ * which these three names get archived. If d0/l1 is first,
+ * none of the three can be restored. If either of the longer
+ * names are first, then the two longer ones can both be
+ * restored.
+ *
+ * The tree-walking code used by bsdtar always visits files
+ * before subdirectories, so bsdtar's behavior is fortunately
+ * deterministic: d0/l1 will always get stored first and the
+ * other two will be stored as hardlinks to d0/l1. Since
+ * d0/l1 can't be extracted, none of these three will be
+ * extracted.
+ *
+ * It may be worth extending this test to force a particular
+ * archiving order so as to exercise both of the cases described
+ * above.
+ *
+ * Of course, this is all totally different for cpio and newc
+ * formats because the hardlink management is different.
+ * TODO: Rename this to test_strip_components_tar and create
+ * parallel tests for cpio and newc formats.
+ */
+ failure("d0/l1 is too short and should not get restored");
+ assertEqualInt(-1, lstat("target/l1", &st));
+ failure("d0/d1/l2 is a hardlink to file whose name was too short");
+ assertEqualInt(-1, lstat("target/l2", &st));
+ failure("d0/d1/d2/f1 is a hardlink to file whose name was too short");
+ assertEqualInt(-1, lstat("target/d2/f1", &st));
+}
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.20 2008/06/09 14:03:55 cperciva Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.21 2008/11/10 05:04:55 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
static void bsdtar_vwarnc(struct bsdtar *, int code,
const char *fmt, va_list ap);
+static const char *strip_components(const char *path, int elements);
/*
* Print a string, taking care with any non-printable characters.
bsdtar->pending_chdir = NULL;
}
+const char *
+strip_components(const char *path, int elements)
+{
+ const char *p = path;
+
+ while (elements > 0) {
+ switch (*p++) {
+ case '/':
+ elements--;
+ path = p;
+ break;
+ case '\0':
+ /* Path is too short, skip it. */
+ return (NULL);
+ }
+ }
+
+ while (*path == '/')
+ ++path;
+ if (*path == '\0')
+ return (NULL);
+
+ return (path);
+}
+
/*
* Handle --strip-components and any future path-rewriting options.
* Returns non-zero if the pathname should not be extracted.
#endif
/* Strip leading dir names as per --strip-components option. */
- if ((r = bsdtar->strip_components) > 0) {
- const char *p = name;
-
- while (r > 0) {
- switch (*p++) {
- case '/':
- r--;
- name = p;
- break;
- case '\0':
- /* Path is too short, skip it. */
+ if (bsdtar->strip_components > 0) {
+ const char *linkname = archive_entry_hardlink(entry);
+
+ name = strip_components(name, bsdtar->strip_components);
+ if (name == NULL)
+ return (1);
+
+ if (linkname != NULL) {
+ linkname = strip_components(linkname,
+ bsdtar->strip_components);
+ if (linkname == NULL)
return (1);
- }
+ archive_entry_copy_hardlink(entry, linkname);
}
- while (*name == '/')
- ++name;
- if (*name == '\0')
- return (1);
}
/* Strip redundant leading '/' characters. */
projects / thirdparty / libarchive.git / commitdiff
