summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/archive_write_disk.c
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2009-01-21 06:55:27 +0000
committerkientzle <kientzle@FreeBSD.org>2009-01-21 06:55:27 +0000
commit6db44bd9b7e133965f4557d4403d0dc6d8b370ad (patch)
tree5fbd6525820818c1402933c6a27ebfeb25e66dd6 /lib/libarchive/archive_write_disk.c
parent50e14c608efac2da56f8271a909fc7bc5396f053 (diff)
downloadFreeBSD-src-6db44bd9b7e133965f4557d4403d0dc6d8b370ad.zip
FreeBSD-src-6db44bd9b7e133965f4557d4403d0dc6d8b370ad.tar.gz
Merge-from-Googlecode r419
In archive_write_disk: If archive_write_header() fails to create the file, that's a failure and should return ARCHIVE_FAILED. Metadata restore failures still return ARCHIVE_WARN, because that's non-critical. Fix test_write_disk_secure test to verify the correct return code in one case; add test_write_disk_failures to do another very simple test of restore failure. This should fix cpio coredumping when it tries to restore to a write-protected directory. Thanks to: Giorgos Keramidas MFC after: 30 days
Diffstat (limited to 'lib/libarchive/archive_write_disk.c')
-rw-r--r--lib/libarchive/archive_write_disk.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/libarchive/archive_write_disk.c b/lib/libarchive/archive_write_disk.c
index 68da515..807c78f 100644
--- a/lib/libarchive/archive_write_disk.c
+++ b/lib/libarchive/archive_write_disk.c
@@ -484,7 +484,7 @@ _archive_write_header(struct archive *_a, struct archive_entry *entry)
}
/* We've created the object and are ready to pour data into it. */
- if (ret == ARCHIVE_OK)
+ if (ret >= ARCHIVE_WARN)
a->archive.state = ARCHIVE_STATE_DATA;
/*
* If it's not open, tell our client not to try writing.
@@ -843,7 +843,7 @@ edit_deep_directories(struct archive_write_disk *a)
*tail = '\0'; /* Terminate dir portion */
ret = create_dir(a, a->name);
if (ret == ARCHIVE_OK && chdir(a->name) != 0)
- ret = ARCHIVE_WARN;
+ ret = ARCHIVE_FAILED;
*tail = '/'; /* Restore the / we removed. */
if (ret != ARCHIVE_OK)
return;
@@ -884,7 +884,7 @@ restore_entry(struct archive_write_disk *a)
/* We tried, but couldn't get rid of it. */
archive_set_error(&a->archive, errno,
"Could not unlink");
- return(ARCHIVE_WARN);
+ return(ARCHIVE_FAILED);
}
}
@@ -903,7 +903,7 @@ restore_entry(struct archive_write_disk *a)
&& (a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) {
/* If we're not overwriting, we're done. */
archive_set_error(&a->archive, en, "Already exists");
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
/*
@@ -918,7 +918,7 @@ restore_entry(struct archive_write_disk *a)
if (rmdir(a->name) != 0) {
archive_set_error(&a->archive, errno,
"Can't remove already-existing dir");
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
a->pst = NULL;
/* Try again. */
@@ -945,7 +945,7 @@ restore_entry(struct archive_write_disk *a)
if (r != 0) {
archive_set_error(&a->archive, errno,
"Can't stat existing object");
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
/*
@@ -974,7 +974,7 @@ restore_entry(struct archive_write_disk *a)
if (unlink(a->name) != 0) {
archive_set_error(&a->archive, errno,
"Can't unlink already-existing object");
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
a->pst = NULL;
/* Try again. */
@@ -984,7 +984,7 @@ restore_entry(struct archive_write_disk *a)
if (rmdir(a->name) != 0) {
archive_set_error(&a->archive, errno,
"Can't remove already-existing dir");
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
/* Try again. */
en = create_filesystem_object(a);
@@ -1007,7 +1007,7 @@ restore_entry(struct archive_write_disk *a)
if (en) {
/* Everything failed; give up here. */
archive_set_error(&a->archive, en, "Can't create '%s'", a->name);
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
a->pst = NULL; /* Cached stat data no longer valid. */
@@ -1393,7 +1393,7 @@ check_symlinks(struct archive_write_disk *a)
"Could not remove symlink %s",
a->name);
pn[0] = c;
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
a->pst = NULL;
/*
@@ -1417,7 +1417,7 @@ check_symlinks(struct archive_write_disk *a)
"Cannot remove intervening symlink %s",
a->name);
pn[0] = c;
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
a->pst = NULL;
} else {
@@ -1425,7 +1425,7 @@ check_symlinks(struct archive_write_disk *a)
"Cannot extract through symlink %s",
a->name);
pn[0] = c;
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
}
}
@@ -1551,7 +1551,7 @@ create_parent_dir(struct archive_write_disk *a, char *path)
* Create the specified dir, recursing to create parents as necessary.
*
* Returns ARCHIVE_OK if the path exists when we're done here.
- * Otherwise, returns ARCHIVE_WARN.
+ * Otherwise, returns ARCHIVE_FAILED.
* Assumes path is in mutable storage; path is unchanged on exit.
*/
static int
@@ -1596,18 +1596,18 @@ create_dir(struct archive_write_disk *a, char *path)
if ((a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) {
archive_set_error(&a->archive, EEXIST,
"Can't create directory '%s'", path);
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
if (unlink(path) != 0) {
archive_set_error(&a->archive, errno,
"Can't create directory '%s': "
"Conflicting file cannot be removed");
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
} else if (errno != ENOENT && errno != ENOTDIR) {
/* Stat failed? */
archive_set_error(&a->archive, errno, "Can't test directory '%s'", path);
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
} else if (slash != NULL) {
*slash = '\0';
r = create_dir(a, path);
@@ -1648,7 +1648,7 @@ create_dir(struct archive_write_disk *a, char *path)
return (ARCHIVE_OK);
archive_set_error(&a->archive, errno, "Failed to create dir '%s'", path);
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
/*
OpenPOWER on IntegriCloud