diff options
| author | kientzle <kientzle@FreeBSD.org> | 2004-03-09 19:50:41 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2004-03-09 19:50:41 +0000 |
| commit | 90072dfae070d180d3c16e0f229fb392b4b910b5 (patch) | |
| tree | cdb30a1bca796a2ba7a0c712682c923cc981d32c /lib/libarchive/archive_write_set_compression_none.c | |
| parent | 63f793ca249823f0c3812457a8342dd6702d0548 (diff) | |
| download | FreeBSD-src-90072dfae070d180d3c16e0f229fb392b4b910b5.zip FreeBSD-src-90072dfae070d180d3c16e0f229fb392b4b910b5.tar.gz | |
Many fixes.
Portability: Thanks to Juergen Lock, libarchive now compiles cleanly
on Linux. Along the way, I cleaned up a lot of error return codes and
reorganized some code to simplify conditional compilation of certain
sections.
Bug fixes:
* pax format now actually stores filenames that are 101-154
characters long.
* pax format now allows newline characters in extended attributes
(this fixes a long-standing bug in ACL handling)
* mtime/atime are now restored for directories
* directory list is now sorted prior to fix-up to permit
correct restore of non-writable dir heirarchies
Diffstat (limited to 'lib/libarchive/archive_write_set_compression_none.c')
| -rw-r--r-- | lib/libarchive/archive_write_set_compression_none.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libarchive/archive_write_set_compression_none.c b/lib/libarchive/archive_write_set_compression_none.c index b0ed24c..579fa8f 100644 --- a/lib/libarchive/archive_write_set_compression_none.c +++ b/lib/libarchive/archive_write_set_compression_none.c @@ -24,10 +24,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> +#include "archive_platform.h" __FBSDID("$FreeBSD$"); -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include <dmalloc.h> #endif #include <errno.h> @@ -119,7 +119,7 @@ archive_compressor_none_write(struct archive *a, const void *vbuff, state = a->compression_data; buff = vbuff; if (a->client_writer == NULL) { - archive_set_error(a, EDOOFUS, + archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, "No write callback is registered? " "This is probably an internal programming error."); return (ARCHIVE_FATAL); @@ -167,7 +167,7 @@ archive_compressor_none_finish(struct archive *a) state = a->compression_data; ret = ret2 = ARCHIVE_OK; if (a->client_writer == NULL) { - archive_set_error(a, EDOOFUS, + archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, "No write callback is registered? " "This is probably an internal programming error."); return (ARCHIVE_FATAL); |
