Index: head/lib/libarchive/archive_string.c =================================================================== --- head/lib/libarchive/archive_string.c (revision 190955) +++ head/lib/libarchive/archive_string.c (revision 190956) @@ -1,446 +1,448 @@ /*- * Copyright (c) 2003-2007 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. * 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. */ #include "archive_platform.h" __FBSDID("$FreeBSD$"); /* * Basic resizable string support, to simplify manipulating arbitrary-sized * strings while minimizing heap activity. */ #ifdef HAVE_STDLIB_H #include #endif #ifdef HAVE_STRING_H #include #endif #ifdef HAVE_WCHAR_H #include #endif #ifdef _WIN32 #include #endif #include "archive_private.h" #include "archive_string.h" struct archive_string * __archive_string_append(struct archive_string *as, const char *p, size_t s) { if (__archive_string_ensure(as, as->length + s + 1) == NULL) __archive_errx(1, "Out of memory"); memcpy(as->s + as->length, p, s); as->s[as->length + s] = 0; as->length += s; return (as); } void __archive_string_copy(struct archive_string *dest, struct archive_string *src) { if (src->length == 0) dest->length = 0; else { if (__archive_string_ensure(dest, src->length + 1) == NULL) __archive_errx(1, "Out of memory"); memcpy(dest->s, src->s, src->length); dest->length = src->length; dest->s[dest->length] = 0; } } void __archive_string_concat(struct archive_string *dest, struct archive_string *src) { if (src->length > 0) { if (__archive_string_ensure(dest, dest->length + src->length + 1) == NULL) __archive_errx(1, "Out of memory"); memcpy(dest->s + dest->length, src->s, src->length); dest->length += src->length; dest->s[dest->length] = 0; } } void __archive_string_free(struct archive_string *as) { as->length = 0; as->buffer_length = 0; if (as->s != NULL) { free(as->s); as->s = NULL; } } /* Returns NULL on any allocation failure. */ struct archive_string * __archive_string_ensure(struct archive_string *as, size_t s) { /* If buffer is already big enough, don't reallocate. */ if (as->s && (s <= as->buffer_length)) return (as); /* * Growing the buffer at least exponentially ensures that * append operations are always linear in the number of * characters appended. Using a smaller growth rate for * larger buffers reduces memory waste somewhat at the cost of * a larger constant factor. */ if (as->buffer_length < 32) /* Start with a minimum 32-character buffer. */ as->buffer_length = 32; else if (as->buffer_length < 8192) /* Buffers under 8k are doubled for speed. */ - as->buffer_length *= 2; + as->buffer_length += as->buffer_length; else { /* Buffers 8k and over grow by at least 25% each time. */ size_t old_length = as->buffer_length; - as->buffer_length = (as->buffer_length * 5) / 4; + as->buffer_length += as->buffer_length / 4; /* Be safe: If size wraps, release buffer and return NULL. */ if (as->buffer_length < old_length) { free(as->s); as->s = NULL; return (NULL); } } /* * The computation above is a lower limit to how much we'll * grow the buffer. In any case, we have to grow it enough to * hold the request. */ if (as->buffer_length < s) as->buffer_length = s; /* Now we can reallocate the buffer. */ as->s = (char *)realloc(as->s, as->buffer_length); if (as->s == NULL) return (NULL); return (as); } struct archive_string * -__archive_strncat(struct archive_string *as, const char *p, size_t n) +__archive_strncat(struct archive_string *as, const void *_p, size_t n) { size_t s; - const char *pp; + const char *p, *pp; + + p = (const char *)_p; /* Like strlen(p), except won't examine positions beyond p[n]. */ s = 0; pp = p; while (*pp && s < n) { pp++; s++; } return (__archive_string_append(as, p, s)); } struct archive_string * __archive_strappend_char(struct archive_string *as, char c) { return (__archive_string_append(as, &c, 1)); } #ifndef _WIN32 /* * Home-grown wctomb for UTF-8. */ static int my_wctomb_utf8(char *p, wchar_t wc) { if (p == NULL) /* UTF-8 doesn't use shift states. */ return (0); if (wc <= 0x7f) { p[0] = (char)wc; return (1); } if (wc <= 0x7ff) { p[0] = 0xc0 | ((wc >> 6) & 0x1f); p[1] = 0x80 | (wc & 0x3f); return (2); } if (wc <= 0xffff) { p[0] = 0xe0 | ((wc >> 12) & 0x0f); p[1] = 0x80 | ((wc >> 6) & 0x3f); p[2] = 0x80 | (wc & 0x3f); return (3); } if (wc <= 0x1fffff) { p[0] = 0xf0 | ((wc >> 18) & 0x07); p[1] = 0x80 | ((wc >> 12) & 0x3f); p[2] = 0x80 | ((wc >> 6) & 0x3f); p[3] = 0x80 | (wc & 0x3f); return (4); } /* Unicode has no codes larger than 0x1fffff. */ /* * Awkward point: UTF-8 <-> wchar_t conversions * can actually fail. */ return (-1); } static int my_wcstombs(struct archive_string *as, const wchar_t *w, int (*func)(char *, wchar_t)) { int n; char *p; char buff[256]; /* Clear the shift state before starting. */ (*func)(NULL, L'\0'); /* * Convert one wide char at a time into 'buff', whenever that * fills, append it to the string. */ p = buff; while (*w != L'\0') { /* Flush the buffer when we have <=16 bytes free. */ /* (No encoding has a single character >16 bytes.) */ if ((size_t)(p - buff) >= (size_t)(sizeof(buff) - 16)) { *p = '\0'; archive_strcat(as, buff); p = buff; } n = (*func)(p, *w++); if (n == -1) return (-1); p += n; } *p = '\0'; archive_strcat(as, buff); return (0); } /* * Translates a wide character string into UTF-8 and appends * to the archive_string. Note: returns NULL if conversion fails. */ struct archive_string * __archive_strappend_w_utf8(struct archive_string *as, const wchar_t *w) { if (my_wcstombs(as, w, my_wctomb_utf8)) return (NULL); return (as); } /* * Translates a wide character string into current locale character set * and appends to the archive_string. Note: returns NULL if conversion * fails. */ struct archive_string * __archive_strappend_w_mbs(struct archive_string *as, const wchar_t *w) { #if HAVE_WCTOMB if (my_wcstombs(as, w, wctomb)) return (NULL); #else /* TODO: Can we do better than this? Are there platforms * that have locale support but don't have wctomb()? */ if (my_wcstombs(as, w, my_wctomb_utf8)) return (NULL); #endif return (as); } /* * Home-grown mbtowc for UTF-8. Some systems lack UTF-8 * (or even lack mbtowc()) and we need UTF-8 support for pax * format. So please don't replace this with a call to the * standard mbtowc() function! */ static int my_mbtowc_utf8(wchar_t *pwc, const char *s, size_t n) { int ch; /* Standard behavior: a NULL value for 's' just resets shift state. */ if (s == NULL) return (0); /* If length argument is zero, don't look at the first character. */ if (n <= 0) return (-1); /* * Decode 1-4 bytes depending on the value of the first byte. */ ch = (unsigned char)*s; if (ch == 0) { return (0); /* Standard: return 0 for end-of-string. */ } if ((ch & 0x80) == 0) { *pwc = ch & 0x7f; return (1); } if ((ch & 0xe0) == 0xc0) { if (n < 2) return (-1); if ((s[1] & 0xc0) != 0x80) return (-1); *pwc = ((ch & 0x1f) << 6) | (s[1] & 0x3f); return (2); } if ((ch & 0xf0) == 0xe0) { if (n < 3) return (-1); if ((s[1] & 0xc0) != 0x80) return (-1); if ((s[2] & 0xc0) != 0x80) return (-1); *pwc = ((ch & 0x0f) << 12) | ((s[1] & 0x3f) << 6) | (s[2] & 0x3f); return (3); } if ((ch & 0xf8) == 0xf0) { if (n < 4) return (-1); if ((s[1] & 0xc0) != 0x80) return (-1); if ((s[2] & 0xc0) != 0x80) return (-1); if ((s[3] & 0xc0) != 0x80) return (-1); *pwc = ((ch & 0x07) << 18) | ((s[1] & 0x3f) << 12) | ((s[2] & 0x3f) << 6) | (s[3] & 0x3f); return (4); } /* Invalid first byte. */ return (-1); } /* * Return a wide-character string by converting this archive_string * from UTF-8. */ wchar_t * __archive_string_utf8_w(struct archive_string *as) { wchar_t *ws, *dest; const char *src; int n; int err; ws = (wchar_t *)malloc((as->length + 1) * sizeof(wchar_t)); if (ws == NULL) __archive_errx(1, "Out of memory"); err = 0; dest = ws; src = as->s; while (*src != '\0') { n = my_mbtowc_utf8(dest, src, 8); if (n == 0) break; if (n < 0) { free(ws); return (NULL); } dest++; src += n; } *dest++ = L'\0'; return (ws); } #else static struct archive_string * my_archive_strappend_w(struct archive_string *as, unsigned int codepage, const wchar_t *w) { char *p; int l, wl; BOOL useDefaultChar = FALSE; wl = (int)wcslen(w); l = wl * 4 + 4; p = malloc(l); if (p == NULL) __archive_errx(1, "Out of memory"); /* To check a useDefaultChar is to simulate error handling of * the my_wcstombs() which is running on non Windows system with * wctomb(). * And to set NULL for last argument is necessary when a codepage * is not CP_ACP(current locale). */ l = WideCharToMultiByte(codepage, 0, w, wl, p, l, NULL, (codepage == CP_ACP) ? &useDefaultChar : NULL); if (l == 0 || useDefaultChar) { free(p); return (NULL); } __archive_string_append(as, p, l); free(p); return (as); } /* * Translates a wide character string into UTF-8 and appends * to the archive_string. Note: returns NULL if conversion fails. */ struct archive_string * __archive_strappend_w_utf8(struct archive_string *as, const wchar_t *w) { return (my_archive_strappend_w(as, CP_UTF8, w)); } /* * Translates a wide character string into current locale character set * and appends to the archive_string. Note: returns NULL if conversion * fails. */ struct archive_string * __archive_strappend_w_mbs(struct archive_string *as, const wchar_t *w) { return (my_archive_strappend_w(as, CP_ACP, w)); } /* * Return a wide-character string by converting this archive_string * from UTF-8. */ wchar_t * __archive_string_utf8_w(struct archive_string *as) { wchar_t *ws; int n; ws = (wchar_t *)malloc((as->length + 1) * sizeof(wchar_t)); if (ws == NULL) __archive_errx(1, "Out of memory"); n = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, as->s, (int)as->length, ws, (int)as->length); if (n == 0) { free(ws); return (NULL); } ws[n] = L'\0'; return (ws); } #endif /* !_WIN32 */ Index: head/lib/libarchive/archive_string.h =================================================================== --- head/lib/libarchive/archive_string.h (revision 190955) +++ head/lib/libarchive/archive_string.h (revision 190956) @@ -1,140 +1,144 @@ /*- * Copyright (c) 2003-2007 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. * 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 #ifdef HAVE_STDLIB_H #include /* required for wchar_t on some systems */ #endif #ifdef HAVE_STRING_H #include #endif #ifdef HAVE_WCHAR_H #include #endif /* * 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 /* Convert a wide-char string to UTF-8 and append the result. */ struct archive_string * __archive_strappend_w_utf8(struct archive_string *, const wchar_t *); #define archive_strappend_w_utf8 __archive_strappend_w_utf8 /* Convert a wide-char string to current locale and append the result. */ /* Returns NULL if conversion fails. */ struct archive_string * __archive_strappend_w_mbs(struct archive_string *, const wchar_t *); #define archive_strappend_w_mbs __archive_strappend_w_mbs /* Basic append operation. */ struct archive_string * __archive_string_append(struct archive_string *as, const char *p, size_t s); /* Copy one archive_string to another */ void __archive_string_copy(struct archive_string *dest, struct archive_string *src); #define archive_string_copy(dest, src) \ __archive_string_copy(dest, src) /* Concatenate one archive_string to another */ void __archive_string_concat(struct archive_string *dest, struct archive_string *src); #define archive_string_concat(dest, src) \ __archive_string_concat(dest, src) /* 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. */ +/* The source is declared void * here because this gets used with + * "signed char *", "unsigned char *" and "char *" arguments. + * Declaring it "char *" as with some of the other functions just + * leads to a lot of extra casts. */ struct archive_string * -__archive_strncat(struct archive_string *, const char *, size_t); +__archive_strncat(struct archive_string *, const void *, 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), p == NULL ? 0 : 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 void __archive_string_sprintf(struct archive_string *, const char *, ...); #define archive_string_sprintf __archive_string_sprintf /* Allocates a fresh buffer and converts as (assumed to be UTF-8) into it. * Returns NULL if conversion failed in any way. */ wchar_t *__archive_string_utf8_w(struct archive_string *as); #endif