diff options
Diffstat (limited to 'src/fcstr.c')
| -rwxr-xr-x | src/fcstr.c | 137 |
1 files changed, 85 insertions, 52 deletions
diff --git a/src/fcstr.c b/src/fcstr.c index f56f823..b712e5d 100755 --- a/src/fcstr.c +++ b/src/fcstr.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcstr.c,v 1.10 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcstr.c * * Copyright © 2000 Keith Packard * @@ -7,15 +7,15 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in + * documentation, and that the name of the author(s) not be used in * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no + * specific, written prior permission. The authors make no * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -50,14 +50,16 @@ FcStrCopy (const FcChar8 *s) FcChar8 * FcStrPlus (const FcChar8 *s1, const FcChar8 *s2) { - int l = strlen ((char *)s1) + strlen ((char *) s2) + 1; + int s1l = strlen ((char *) s1); + int s2l = strlen ((char *) s2); + int l = s1l + s2l + 1; FcChar8 *s = malloc (l); if (!s) return 0; FcMemAlloc (FC_MEM_STRING, l); - strcpy ((char *) s, (char *) s1); - strcat ((char *) s, (char *) s2); + memcpy (s, s1, s1l); + memcpy (s + s1l, s2, s2l + 1); return s; } @@ -109,7 +111,7 @@ FcStrCaseWalkerLong (FcCaseWalker *w, FcChar8 r) int mid = (min + max) >> 1; FcChar32 low = fcCaseFold[mid].upper; FcChar32 high = low + FcCaseFoldUpperCount (&fcCaseFold[mid]); - + if (high <= ucs4) min = mid + 1; else if (ucs4 < low) @@ -158,7 +160,7 @@ FcStrCaseWalkerNext (FcCaseWalker *w) w->read = 0; } r = *w->src++; - + if ((r & 0xc0) == 0xc0) return FcStrCaseWalkerLong (w, r); if ('A' <= r && r <= 'Z') @@ -181,7 +183,7 @@ FcStrCaseWalkerNextIgnoreBlanks (FcCaseWalker *w) { r = *w->src++; } while (r == ' '); - + if ((r & 0xc0) == 0xc0) return FcStrCaseWalkerLong (w, r); if ('A' <= r && r <= 'Z') @@ -215,11 +217,11 @@ FcStrCmpIgnoreCase (const FcChar8 *s1, const FcChar8 *s2) FcChar8 c1, c2; if (s1 == s2) return 0; - + FcStrCaseWalkerInit (s1, &w1); FcStrCaseWalkerInit (s2, &w2); - - for (;;) + + for (;;) { c1 = FcStrCaseWalkerNext (&w1); c2 = FcStrCaseWalkerNext (&w2); @@ -236,11 +238,11 @@ FcStrCmpIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2) FcChar8 c1, c2; if (s1 == s2) return 0; - + FcStrCaseWalkerInit (s1, &w1); FcStrCaseWalkerInit (s2, &w2); - - for (;;) + + for (;;) { c1 = FcStrCaseWalkerNextIgnoreBlanks (&w1); c2 = FcStrCaseWalkerNextIgnoreBlanks (&w2); @@ -254,10 +256,10 @@ int FcStrCmp (const FcChar8 *s1, const FcChar8 *s2) { FcChar8 c1, c2; - + if (s1 == s2) return 0; - for (;;) + for (;;) { c1 = *s1++; c2 = *s2++; @@ -296,8 +298,8 @@ FcStrIsAtIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2) FcStrCaseWalkerInit (s1, &w1); FcStrCaseWalkerInit (s2, &w2); - - for (;;) + + for (;;) { c1 = FcStrCaseWalkerNextIgnoreBlanks (&w1); c2 = FcStrCaseWalkerNextIgnoreBlanks (&w2); @@ -355,8 +357,8 @@ FcStrIsAtIgnoreCase (const FcChar8 *s1, const FcChar8 *s2) FcStrCaseWalkerInit (s1, &w1); FcStrCaseWalkerInit (s2, &w2); - - for (;;) + + for (;;) { c1 = FcStrCaseWalkerNext (&w1); c2 = FcStrCaseWalkerNext (&w2); @@ -395,7 +397,7 @@ FcStrContainsWord (const FcChar8 *s1, const FcChar8 *s2) while (s1len >= s2len) { - if (wordStart && + if (wordStart && FcStrIsAtIgnoreCase (s1, s2) && (s1len == s2len || FcCharIsPunct (s1[s2len]))) { @@ -422,12 +424,12 @@ FcStrStrIgnoreCase (const FcChar8 *s1, const FcChar8 *s2) if (s1 == s2) return s1; - + FcStrCaseWalkerInit (s1, &w1); FcStrCaseWalkerInit (s2, &w2); - + c2 = FcStrCaseWalkerNext (&w2); - + for (;;) { cur = w1.src; @@ -474,7 +476,7 @@ again: if (!c2) return 0; - for (;;) + for (;;) { p = s1; c1 = *s1++; @@ -517,15 +519,15 @@ FcUtf8ToUcs4 (const FcChar8 *src_orig, if (len == 0) return 0; - + s = *src++; len--; - + if (!(s & 0x80)) { result = s; extra = 0; - } + } else if (!(s & 0x40)) { return -1; @@ -561,7 +563,7 @@ FcUtf8ToUcs4 (const FcChar8 *src_orig, } if (extra > len) return -1; - + while (extra--) { result <<= 6; @@ -586,7 +588,7 @@ FcUtf8Len (const FcChar8 *string, int clen; FcChar32 c; FcChar32 max; - + n = 0; max = 0; while (len) @@ -616,7 +618,7 @@ FcUcs4ToUtf8 (FcChar32 ucs4, { int bits; FcChar8 *d = dest; - + if (ucs4 < 0x80) { *d++= ucs4; bits= -6; } else if (ucs4 < 0x800) { *d++= ((ucs4 >> 6) & 0x1F) | 0xC0; bits= 0; } else if (ucs4 < 0x10000) { *d++= ((ucs4 >> 12) & 0x0F) | 0xE0; bits= 6; } @@ -647,11 +649,11 @@ FcUtf16ToUcs4 (const FcChar8 *src_orig, if (len < 2) return 0; - + a = GetUtf16 (src, endian); src += 2; len -= 2; - - /* - * Check for surrogate + + /* + * Check for surrogate */ if ((a & 0xfc00) == 0xd800) { @@ -683,7 +685,7 @@ FcUtf16Len (const FcChar8 *string, int clen; FcChar32 c; FcChar32 max; - + n = 0; max = 0; while (len) @@ -710,11 +712,18 @@ FcUtf16Len (const FcChar8 *string, void FcStrBufInit (FcStrBuf *buf, FcChar8 *init, int size) { - buf->buf = init; + if (init) + { + buf->buf = init; + buf->size = size; + } else + { + buf->buf = buf->buf_static; + buf->size = sizeof (buf->buf_static); + } buf->allocated = FcFalse; buf->failed = FcFalse; buf->len = 0; - buf->size = size; } void @@ -733,7 +742,10 @@ FcStrBufDone (FcStrBuf *buf) { FcChar8 *ret; - ret = malloc (buf->len + 1); + if (buf->failed) + ret = NULL; + else + ret = malloc (buf->len + 1); if (ret) { FcMemAlloc (FC_MEM_STRING, buf->len + 1); @@ -744,6 +756,17 @@ FcStrBufDone (FcStrBuf *buf) return ret; } +FcChar8 * +FcStrBufDoneStatic (FcStrBuf *buf) +{ + FcStrBufChar (buf, '\0'); + + if (buf->failed) + return NULL; + + return buf->buf; +} + FcBool FcStrBufChar (FcStrBuf *buf, FcChar8 c) { @@ -752,6 +775,9 @@ FcStrBufChar (FcStrBuf *buf, FcChar8 c) FcChar8 *new; int size; + if (buf->failed) + return FcFalse; + if (buf->allocated) { size = buf->size * 2; @@ -811,7 +837,7 @@ FcChar8 * FcStrCopyFilename (const FcChar8 *s) { FcChar8 *new; - + if (*s == '~') { FcChar8 *home = FcConfigHome (); @@ -851,7 +877,7 @@ FcStrLastSlash (const FcChar8 *path) return slash; } - + FcChar8 * FcStrDirname (const FcChar8 *file) { @@ -902,6 +928,9 @@ FcStrCanonAbsoluteFilename (const FcChar8 *s) if (slash) { switch (s - slash) { + case 1: + f -= 1; /* squash // and trim final / from file */ + break; case 2: if (!strncmp ((char *) slash, "/.", 2)) { @@ -927,10 +956,10 @@ FcStrCanonAbsoluteFilename (const FcChar8 *s) } return file; } - + #ifdef _WIN32 /* - * Convert '\\' to '/' , remove double '/' + * Convert '\\' to '/' , remove double '/' */ static void FcConvertDosPath (char *str) @@ -940,7 +969,13 @@ FcConvertDosPath (char *str) char *dest = str; char *end = str + len; char last = 0; - + + if (*p == '\\') + { + *p = '/'; + p++; + dest++; + } while (p < end) { if (*p == '\\') @@ -965,10 +1000,8 @@ FcStrCanonFilename (const FcChar8 *s) { #ifdef _WIN32 FcChar8 full[FC_MAX_FILE_LEN + 2]; - FcChar8 basename[FC_MAX_FILE_LEN + 2]; int size = GetFullPathName (s, sizeof (full) -1, - full, - basename); + full, NULL); if (size == 0) perror ("GetFullPathName"); @@ -1104,7 +1137,7 @@ FcStrSetDel (FcStrSet *set, const FcChar8 *s) * copy remaining string pointers and trailing * NULL */ - memmove (&set->strs[i], &set->strs[i+1], + memmove (&set->strs[i], &set->strs[i+1], (set->num - i) * sizeof (FcChar8 *)); set->num--; return FcTrue; @@ -1118,7 +1151,7 @@ FcStrSetDestroy (FcStrSet *set) if (--set->ref == 0) { int i; - + for (i = 0; i < set->num; i++) FcStrFree (set->strs[i]); if (set->strs) |