44a3d34206
* Disabled shared-library building, as some API breakage is still likely. (I didn't realize it was turned on by default.) If you have an existing /usr/lib/libarchive.so.2, I recommend deleting it. * Pax interchange format now correctly stores and reads UTF8 for extended attributes. In particular, pax format can portably handle arbitrarily long pathnames containing arbitrary characters. * Library compiles cleanly at -O2, -O3, and WARNS=6 on all FreeBSD-CURRENT platforms. * Minor portability improvements inspired by Juergen Lock and Greg Lewis. (Less reliance on stdint.h, isolating of various portability-challenged constructs.) * archive_entry transparently converts multi-byte <-> wide character strings, allowing clients and format handlers to deal with either one, as appropriate. * Support for reading 'L' and 'K' entries in standard tar archives for star compatibility. * Recognize (but don't yet handle) ACL entries from Solaris tar. * Pushed format-specific data for format readers down into format-specific storage and out of library-global storage. This should make it easier to maintain individual formats without mucking with the core library management. * Documentation updates to track the above changes. * Updates to tar.5 to correct a few mistakes and add some additional information about GNU tar and Solaris tar formats. Notes: * The basic 'tar' reader is getting more general; there's not much point in keeping the 'gnutar' reader separate. Merging the two would lose a bunch of duplicate code. * The libc ACL support is looking increasingly inadequate for my needs here. I might need to assemble some fairly significant code for parsing and building ACLs. <sigh>
113 lines
4.2 KiB
C
113 lines
4.2 KiB
C
/*-
|
|
* Copyright (c) 2003-2004 Tim Kientzle
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer
|
|
* in this position and unchanged.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*
|
|
*/
|
|
|
|
#ifndef ARCHIVE_STRING_H_INCLUDED
|
|
#define ARCHIVE_STRING_H_INCLUDED
|
|
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
|
|
/*
|
|
* Basic resizable/reusable string support a la Java's "StringBuffer."
|
|
*
|
|
* Unlike sbuf(9), the buffers here are fully reusable and track the
|
|
* length throughout.
|
|
*
|
|
* Note that all visible symbols here begin with "__archive" as they
|
|
* are internal symbols not intended for anyone outside of this library
|
|
* to see or use.
|
|
*/
|
|
|
|
struct archive_string {
|
|
char *s; /* Pointer to the storage */
|
|
size_t length; /* Length of 's' */
|
|
size_t buffer_length; /* Length of malloc-ed storage */
|
|
};
|
|
|
|
/* Initialize an archive_string object on the stack or elsewhere. */
|
|
#define archive_string_init(a) \
|
|
do { (a)->s = NULL; (a)->length = 0; (a)->buffer_length = 0; } while(0)
|
|
|
|
/* Append a C char to an archive_string, resizing as necessary. */
|
|
struct archive_string *
|
|
__archive_strappend_char(struct archive_string *, char);
|
|
#define archive_strappend_char __archive_strappend_char
|
|
|
|
/* Append a char to an archive_string using UTF8. */
|
|
struct archive_string *
|
|
__archive_strappend_char_UTF8(struct archive_string *, int);
|
|
#define archive_strappend_char_UTF8 __archive_strappend_char_UTF8
|
|
|
|
/* Basic append operation. */
|
|
struct archive_string *
|
|
__archive_string_append(struct archive_string *as, const char *p, size_t s);
|
|
|
|
/* Ensure that the underlying buffer is at least as large as the request. */
|
|
struct archive_string *
|
|
__archive_string_ensure(struct archive_string *, size_t);
|
|
#define archive_string_ensure __archive_string_ensure
|
|
|
|
/* Append C string, which may lack trailing \0. */
|
|
struct archive_string *
|
|
__archive_strncat(struct archive_string *, const char *, size_t);
|
|
#define archive_strncat __archive_strncat
|
|
|
|
/* Append a C string to an archive_string, resizing as necessary. */
|
|
#define archive_strcat(as,p) __archive_string_append((as),(p),strlen(p))
|
|
|
|
/* Copy a C string to an archive_string, resizing as necessary. */
|
|
#define archive_strcpy(as,p) \
|
|
((as)->length = 0, __archive_string_append((as), (p), strlen(p)))
|
|
|
|
/* Copy a C string to an archive_string with limit, resizing as necessary. */
|
|
#define archive_strncpy(as,p,l) \
|
|
((as)->length=0, archive_strncat((as), (p), (l)))
|
|
|
|
/* Return length of string. */
|
|
#define archive_strlen(a) ((a)->length)
|
|
|
|
/* Set string length to zero. */
|
|
#define archive_string_empty(a) ((a)->length = 0)
|
|
|
|
/* Release any allocated storage resources. */
|
|
void __archive_string_free(struct archive_string *);
|
|
#define archive_string_free __archive_string_free
|
|
|
|
/* Like 'vsprintf', but resizes the underlying string as necessary. */
|
|
void __archive_string_vsprintf(struct archive_string *, const char *,
|
|
va_list);
|
|
#define archive_string_vsprintf __archive_string_vsprintf
|
|
|
|
/* Like 'sprintf', but resizes the underlying string as necessary. */
|
|
void __archive_string_sprintf(struct archive_string *, const char *, ...);
|
|
#define archive_string_sprintf __archive_string_sprintf
|
|
|
|
|
|
#endif
|