summaryrefslogtreecommitdiff
path: root/libarchive/archive_write.c
diff options
context:
space:
mode:
Diffstat (limited to 'libarchive/archive_write.c')
-rw-r--r--libarchive/archive_write.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
index f38e5c11c6569..6fc3907f3631b 100644
--- a/libarchive/archive_write.c
+++ b/libarchive/archive_write.c
@@ -380,7 +380,7 @@ archive_write_client_write(struct archive_write_filter *f,
}
}
- while ((size_t)remaining > state->buffer_size) {
+ while ((size_t)remaining >= state->buffer_size) {
/* Write out full blocks directly to client. */
bytes_written = (a->client_writer)(&a->archive,
a->client_data, buff, state->buffer_size);
@@ -623,7 +623,7 @@ _archive_write_header(struct archive *_a, struct archive_entry *entry)
if (a->skip_file_set &&
archive_entry_dev_is_set(entry) &&
archive_entry_ino_is_set(entry) &&
- archive_entry_dev(entry) == a->skip_file_dev &&
+ archive_entry_dev(entry) == (dev_t)a->skip_file_dev &&
archive_entry_ino64(entry) == a->skip_file_ino) {
archive_set_error(&a->archive, 0,
"Can't add archive to itself");