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_string_sprintf.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_string_sprintf.c')
| -rw-r--r-- | lib/libarchive/archive_string_sprintf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libarchive/archive_string_sprintf.c b/lib/libarchive/archive_string_sprintf.c index c24a747..5609dd9 100644 --- a/lib/libarchive/archive_string_sprintf.c +++ b/lib/libarchive/archive_string_sprintf.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> +#include "archive_platform.h" __FBSDID("$FreeBSD$"); /* @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); * the core code, so it cannot easily be omitted.) */ -#ifdef DMALLOC +#ifdef HAVE_DMALLOC #include <dmalloc.h> #endif #include <err.h> @@ -63,6 +63,7 @@ __archive_string_vsprintf(struct archive_string *as, const char *fmt, __archive_string_ensure(as, l + 1); l = vsnprintf(as->s, as->buffer_length, fmt, ap); } + as->length = l; } /* |
