int r;
if (cpio->option_append)
- lafe_errc(1, 0, "Append mode not yet supported.");
+ lafe_errc(1, 0, "Append mode not yet supported");
cpio->archive_read_disk = archive_read_disk_new();
if (cpio->archive_read_disk == NULL)
if (bytes_write < bytes_read) {
lafe_warnc(0,
"Truncated write; file may have "
- "grown while being archived.");
+ "grown while being archived");
}
bytes_read = read(fd, buff, sizeof(buff));
}
if (!handle_type) {
errmsg("PROGRAMMER ERROR: Function ");
errmsg(function);
- errmsg(" invoked with invalid archive handle.\n");
+ errmsg(" invoked with invalid archive handle\n");
diediedie();
}
client_skip_proxy(struct archive_read_filter *self, int64_t request)
{
if (request < 0)
- __archive_errx(1, "Negative skip requested.");
+ __archive_errx(1, "Negative skip requested");
if (request == 0)
return 0;
case READ_LEGACY_STREAM:
/* Reading a lz4 stream already failed. */
archive_set_error(&self->archive->archive,
- ARCHIVE_ERRNO_MISC, "Invalid sequence.");
+ ARCHIVE_ERRNO_MISC, "Invalid sequence");
return (ARCHIVE_FATAL);
case READ_DEFAULT_BLOCK:
ret = lz4_filter_read_default_stream(self, p);
break;
default:
archive_set_error(&self->archive->archive,
- ARCHIVE_ERRNO_MISC, "Program error.");
+ ARCHIVE_ERRNO_MISC, "Program error");
return (ARCHIVE_FATAL);
}
-15 /* Don't check for zlib header */);
if (r != Z_OK) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Couldn't initialize zlib stream.");
+ "Couldn't initialize zlib stream");
return (ARCHIVE_FAILED);
}
zip->stream_valid = 1;
-15 /* Don't check for zlib header */);
if (r != Z_OK) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Can't initialize deflate decompression.");
+ "Can't initialize deflate decompression");
*avail = ARCHIVE_FATAL;
return (NULL);
}
r = inflateInit(&zisofs->stream);
if (r != Z_OK) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Can't initialize zisofs decompression.");
+ "Can't initialize zisofs decompression");
return (ARCHIVE_FATAL);
}
zisofs->stream_valid = 1;
if ((repeatnode = new_node(code)) < 0) {
archive_set_error(&a->archive, ENOMEM,
- "Unable to allocate memory for node data.");
+ "Unable to allocate memory for node data");
return (ARCHIVE_FATAL);
}
if ((nextnode = new_node(code)) < 0) {
archive_set_error(&a->archive, ENOMEM,
- "Unable to allocate memory for node data.");
+ "Unable to allocate memory for node data");
return (ARCHIVE_FATAL);
}
-15 /* Don't check for zlib header */);
if (r != Z_OK) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Can't initialize ZIP decompression.");
+ "Can't initialize ZIP decompression");
return (ARCHIVE_FATAL);
}
/* Stream structure has been set up. */
if (a->format_write_header == NULL) {
archive_set_error(&(a->archive), -1,
- "Format must be set before you can write to an archive.");
+ "Format must be set before you can write to an archive");
a->archive.state = ARCHIVE_STATE_FATAL;
return (ARCHIVE_FATAL);
}
r = inflateInit(&zisofs->stream);
if (r != Z_OK) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Can't initialize zisofs decompression.");
+ "Can't initialize zisofs decompression");
return (ARCHIVE_FATAL);
}
zisofs->stream_valid = 1;
if (bsdtar->return_value != 0)
lafe_warnc(0,
- "Error exit delayed from previous errors.");
+ "Error exit delayed from previous errors");
return (bsdtar->return_value);
}
break;
p = archive_entry_pathname(entry);
if (p == NULL || p[0] == '\0') {
- lafe_warnc(0, "Archive entry has empty or unreadable filename ... skipping.");
+ lafe_warnc(0, "Archive entry has empty or unreadable filename ... skipping");
bsdtar->return_value = 1;
continue;
}
archive_read_free(a);
close(bsdtar->fd);
lafe_errc(1, 0,
- "Cannot append to compressed archive.");
+ "Cannot append to compressed archive");
}
/* Keep going until we hit end-of-archive */
format = archive_format(a);
if (format != (int)(archive_format(a) & ARCHIVE_FORMAT_BASE_MASK)
&& format != ARCHIVE_FORMAT_EMPTY) {
lafe_errc(1, 0,
- "Format %s is incompatible with the archive %s.",
+ "Format %s is incompatible with the archive %s",
cset_get_format(bsdtar->cset), bsdtar->filename);
}
} else {
archive_read_free(a);
close(bsdtar->fd);
lafe_errc(1, 0,
- "Cannot append to compressed archive.");
+ "Cannot append to compressed archive");
}
if (archive_match_exclude_entry(bsdtar->matching,
ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_OLDER |
* continue. */
lafe_warnc(0,
"%s: Truncated write; file may "
- "have grown while being archived.",
+ "have grown while being archived",
archive_entry_pathname(entry));
return (0);
}
/* Write was truncated; warn but continue. */
lafe_warnc(0,
"%s: Truncated write; file may have grown "
- "while being archived.",
+ "while being archived",
archive_entry_pathname(entry));
return (0);
}
if (*bsdtar->argv == NULL && bsdtar->names_from_file == NULL)
lafe_errc(1, 0, "no files or directories specified");
if (bsdtar->filename == NULL)
- lafe_errc(1, 0, "Cannot append to stdout.");
+ lafe_errc(1, 0, "Cannot append to stdout");
if (stat(bsdtar->filename, &s) != 0)
return;
if (!S_ISREG(s.st_mode) && !S_ISBLK(s.st_mode))
lafe_errc(1, 0,
- "Cannot append to %s: not a regular file.",
+ "Cannot append to %s: not a regular file",
bsdtar->filename);
/* Is this an appropriate check here on Windows? */