a24d28f8e3
feedback, but the 2.5 branch is shaping up nicely.) In addition to many small bug fixes and code improvements: * Another iteration of versioning; I think I've got it right now. * Portability: A lot of progress on Windows support (though I'm not committing all of the Windows support files to FreeBSD CVS) * Explicit tracking of MBS, WCS, and UTF-8 versions of strings in archive_entry; the archive_entry routines now correctly return NULL only when something is unset, setting NULL properly clears string values. Most charset conversions have been pushed down to archive_string. * Better handling of charset conversion failure when writing or reading UTF-8 headers in pax archives * archive_entry_linkify() provides multiple strategies for hardlink matching to suit different format expectations * More accurate bzip2 format detection * Joerg Sonnenberger's extensive improvements to mtree support * Rough support for self-extracting ZIP archives. Not an ideal approach, but it works for the archives I've tried. * New "sparsify" option in archive_write_disk converts blocks of nulls into seeks. * Better default behavior for the test harness; it now reports all failures by default instead of coredumping at the first one.
157 lines
3.9 KiB
C
157 lines
3.9 KiB
C
/*-
|
|
* Copyright (c) 2002 Thomas Moestl <tmm@FreeBSD.org>
|
|
* 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.
|
|
* 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$
|
|
*
|
|
* Borrowed from FreeBSD's <sys/endian.h>
|
|
*/
|
|
|
|
/* Note: This is a purely internal header! */
|
|
/* Do not use this outside of libarchive internal code! */
|
|
|
|
#ifndef ARCHIVE_ENDIAN_H_INCLUDED
|
|
#define ARCHIVE_ENDIAN_H_INCLUDED
|
|
|
|
|
|
/* Watcom C++ doesn't support 'inline' in C code. (For any version?) */
|
|
#if defined( __WATCOMC__ )
|
|
#define inline
|
|
#endif
|
|
|
|
/* Visual C++ 6.0 doesn't support 'inline' in C code. (Does VC7? VC8?) */
|
|
#if defined(_MSC_VER)
|
|
#define inline
|
|
#endif
|
|
|
|
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
|
|
|
|
static inline uint16_t
|
|
archive_be16dec(const void *pp)
|
|
{
|
|
unsigned char const *p = (unsigned char const *)pp;
|
|
|
|
return ((p[0] << 8) | p[1]);
|
|
}
|
|
|
|
static inline uint32_t
|
|
archive_be32dec(const void *pp)
|
|
{
|
|
unsigned char const *p = (unsigned char const *)pp;
|
|
|
|
return ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
|
|
}
|
|
|
|
static inline uint64_t
|
|
archive_be64dec(const void *pp)
|
|
{
|
|
unsigned char const *p = (unsigned char const *)pp;
|
|
|
|
return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4));
|
|
}
|
|
|
|
static inline uint16_t
|
|
archive_le16dec(const void *pp)
|
|
{
|
|
unsigned char const *p = (unsigned char const *)pp;
|
|
|
|
return ((p[1] << 8) | p[0]);
|
|
}
|
|
|
|
static inline uint32_t
|
|
archive_le32dec(const void *pp)
|
|
{
|
|
unsigned char const *p = (unsigned char const *)pp;
|
|
|
|
return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
|
|
}
|
|
|
|
static inline uint64_t
|
|
archive_le64dec(const void *pp)
|
|
{
|
|
unsigned char const *p = (unsigned char const *)pp;
|
|
|
|
return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p));
|
|
}
|
|
|
|
static inline void
|
|
archive_be16enc(void *pp, uint16_t u)
|
|
{
|
|
unsigned char *p = (unsigned char *)pp;
|
|
|
|
p[0] = (u >> 8) & 0xff;
|
|
p[1] = u & 0xff;
|
|
}
|
|
|
|
static inline void
|
|
archive_be32enc(void *pp, uint32_t u)
|
|
{
|
|
unsigned char *p = (unsigned char *)pp;
|
|
|
|
p[0] = (u >> 24) & 0xff;
|
|
p[1] = (u >> 16) & 0xff;
|
|
p[2] = (u >> 8) & 0xff;
|
|
p[3] = u & 0xff;
|
|
}
|
|
|
|
static inline void
|
|
archive_be64enc(void *pp, uint64_t u)
|
|
{
|
|
unsigned char *p = (unsigned char *)pp;
|
|
|
|
archive_be32enc(p, u >> 32);
|
|
archive_be32enc(p + 4, u & 0xffffffff);
|
|
}
|
|
|
|
static inline void
|
|
archive_le16enc(void *pp, uint16_t u)
|
|
{
|
|
unsigned char *p = (unsigned char *)pp;
|
|
|
|
p[0] = u & 0xff;
|
|
p[1] = (u >> 8) & 0xff;
|
|
}
|
|
|
|
static inline void
|
|
archive_le32enc(void *pp, uint32_t u)
|
|
{
|
|
unsigned char *p = (unsigned char *)pp;
|
|
|
|
p[0] = u & 0xff;
|
|
p[1] = (u >> 8) & 0xff;
|
|
p[2] = (u >> 16) & 0xff;
|
|
p[3] = (u >> 24) & 0xff;
|
|
}
|
|
|
|
static inline void
|
|
archive_le64enc(void *pp, uint64_t u)
|
|
{
|
|
unsigned char *p = (unsigned char *)pp;
|
|
|
|
archive_le32enc(p, u & 0xffffffff);
|
|
archive_le32enc(p + 4, u >> 32);
|
|
}
|
|
|
|
#endif
|