X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcstr.c;h=34115ce86a264aa3c710c2e91c02afed96435ca5;hb=0a023b24daa683d9c0be4e2ef6d50040c1c52316;hp=1391b6554dbc5dede8a737e839853114448d8108;hpb=cd2ec1a940888ebcbd323a8000d2fcced41ddf9e;p=fontconfig.git diff --git a/src/fcstr.c b/src/fcstr.c index 1391b65..34115ce 100644 --- 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 * @@ -13,32 +13,37 @@ * 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 * PERFORMANCE OF THIS SOFTWARE. */ +#include "fcint.h" #include #include #include -#include "fcint.h" +#ifdef _WIN32 +#include +#endif FcChar8 * FcStrCopy (const FcChar8 *s) { - FcChar8 *r; + int len; + FcChar8 *r; if (!s) return 0; - r = (FcChar8 *) malloc (strlen ((char *) s) + 1); + len = strlen ((char *) s) + 1; + r = (FcChar8 *) malloc (len); if (!r) return 0; - FcMemAlloc (FC_MEM_STRING, strlen ((char *) s) + 1); - strcpy ((char *) r, (char *) s); + FcMemAlloc (FC_MEM_STRING, len); + memcpy (r, s, len); return r; } @@ -74,7 +79,6 @@ FcStrFree (FcChar8 *s) typedef struct _FcCaseWalker { const FcChar8 *read; const FcChar8 *src; - int len; FcChar8 utf8[FC_MAX_CASE_FOLD_CHARS + 1]; } FcCaseWalker; @@ -83,7 +87,6 @@ FcStrCaseWalkerInit (const FcChar8 *src, FcCaseWalker *w) { w->src = src; w->read = 0; - w->len = strlen (src); } static FcChar8 @@ -91,8 +94,9 @@ FcStrCaseWalkerLong (FcCaseWalker *w, FcChar8 r) { FcChar32 ucs4; int slen; + int len = strlen((char*)w->src); - slen = FcUtf8ToUcs4 (w->src - 1, &ucs4, w->len + 1); + slen = FcUtf8ToUcs4 (w->src - 1, &ucs4, len + 1); if (slen <= 0) return r; if (FC_MIN_FOLD_CHAR <= ucs4 && ucs4 <= FC_MAX_FOLD_CHAR) @@ -105,7 +109,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) @@ -131,7 +135,6 @@ FcStrCaseWalkerLong (FcCaseWalker *w, FcChar8 r) /* consume rest of src utf-8 bytes */ w->src += slen - 1; - w->len -= slen - 1; /* read from temp buffer */ w->utf8[dlen] = '\0'; @@ -155,8 +158,7 @@ FcStrCaseWalkerNext (FcCaseWalker *w) w->read = 0; } r = *w->src++; - --w->len; - + if ((r & 0xc0) == 0xc0) return FcStrCaseWalkerLong (w, r); if ('A' <= r && r <= 'Z') @@ -178,9 +180,8 @@ FcStrCaseWalkerNextIgnoreBlanks (FcCaseWalker *w) do { r = *w->src++; - --w->len; } while (r == ' '); - + if ((r & 0xc0) == 0xc0) return FcStrCaseWalkerLong (w, r); if ('A' <= r && r <= 'Z') @@ -214,11 +215,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); @@ -235,11 +236,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); @@ -253,10 +254,10 @@ int FcStrCmp (const FcChar8 *s1, const FcChar8 *s2) { FcChar8 c1, c2; - + if (s1 == s2) return 0; - for (;;) + for (;;) { c1 = *s1++; c2 = *s2++; @@ -295,8 +296,8 @@ FcStrIsAtIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2) FcStrCaseWalkerInit (s1, &w1); FcStrCaseWalkerInit (s2, &w2); - - for (;;) + + for (;;) { c1 = FcStrCaseWalkerNextIgnoreBlanks (&w1); c2 = FcStrCaseWalkerNextIgnoreBlanks (&w2); @@ -322,6 +323,26 @@ FcStrContainsIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2) return 0; } +static FcBool +FcCharIsPunct (const FcChar8 c) +{ + if (c < '0') + return FcTrue; + if (c <= '9') + return FcFalse; + if (c < 'A') + return FcTrue; + if (c <= 'Z') + return FcFalse; + if (c < 'a') + return FcTrue; + if (c <= 'z') + return FcFalse; + if (c <= '~') + return FcTrue; + return FcFalse; +} + /* * Is the head of s1 equal to s2? */ @@ -334,8 +355,8 @@ FcStrIsAtIgnoreCase (const FcChar8 *s1, const FcChar8 *s2) FcStrCaseWalkerInit (s1, &w1); FcStrCaseWalkerInit (s2, &w2); - - for (;;) + + for (;;) { c1 = FcStrCaseWalkerNext (&w1); c2 = FcStrCaseWalkerNext (&w2); @@ -361,6 +382,34 @@ FcStrContainsIgnoreCase (const FcChar8 *s1, const FcChar8 *s2) return 0; } +/* + * Does s1 contain an instance of s2 on a word boundary (ignoring case)? + */ + +const FcChar8 * +FcStrContainsWord (const FcChar8 *s1, const FcChar8 *s2) +{ + FcBool wordStart = FcTrue; + int s1len = strlen ((char *) s1); + int s2len = strlen ((char *) s2); + + while (s1len >= s2len) + { + if (wordStart && + FcStrIsAtIgnoreCase (s1, s2) && + (s1len == s2len || FcCharIsPunct (s1[s2len]))) + { + return s1; + } + wordStart = FcFalse; + if (FcCharIsPunct (*s1)) + wordStart = FcTrue; + s1++; + s1len--; + } + return 0; +} + const FcChar8 * FcStrStrIgnoreCase (const FcChar8 *s1, const FcChar8 *s2) { @@ -373,12 +422,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; @@ -425,7 +474,7 @@ again: if (!c2) return 0; - for (;;) + for (;;) { p = s1; c1 = *s1++; @@ -453,8 +502,7 @@ again: ++ s1; ++ s2; } - - return 0; + /* never reached. */ } int @@ -469,15 +517,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; @@ -513,7 +561,7 @@ FcUtf8ToUcs4 (const FcChar8 *src_orig, } if (extra > len) return -1; - + while (extra--) { result <<= 6; @@ -538,7 +586,7 @@ FcUtf8Len (const FcChar8 *string, int clen; FcChar32 c; FcChar32 max; - + n = 0; max = 0; while (len) @@ -568,7 +616,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; } @@ -599,11 +647,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) { @@ -635,7 +683,7 @@ FcUtf16Len (const FcChar8 *string, int clen; FcChar32 c; FcChar32 max; - + n = 0; max = 0; while (len) @@ -662,11 +710,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 @@ -685,7 +740,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); @@ -696,6 +754,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) { @@ -704,6 +773,9 @@ FcStrBufChar (FcStrBuf *buf, FcChar8 c) FcChar8 *new; int size; + if (buf->failed) + return FcFalse; + if (buf->allocated) { size = buf->size * 2; @@ -711,7 +783,7 @@ FcStrBufChar (FcStrBuf *buf, FcChar8 c) } else { - size = buf->size + 1024; + size = buf->size + 64; new = malloc (size); if (new) { @@ -763,30 +835,25 @@ FcChar8 * FcStrCopyFilename (const FcChar8 *s) { FcChar8 *new; - + if (*s == '~') { FcChar8 *home = FcConfigHome (); + FcChar8 *full; int size; if (!home) return 0; size = strlen ((char *) home) + strlen ((char *) s); - new = (FcChar8 *) malloc (size); - if (!new) + full = (FcChar8 *) malloc (size); + if (!full) return 0; - FcMemAlloc (FC_MEM_STRING, size); - strcpy ((char *) new, (char *) home); - strcat ((char *) new, (char *) s + 1); + strcpy ((char *) full, (char *) home); + strcat ((char *) full, (char *) s + 1); + new = FcStrCanonFilename (full); + free (full); } else - { - int size = strlen ((char *) s) + 1; - new = (FcChar8 *) malloc (size); - if (!new) - return 0; - FcMemAlloc (FC_MEM_STRING, size); - strcpy ((char *) new, (const char *) s); - } + new = FcStrCanonFilename (s); return new; } @@ -808,7 +875,7 @@ FcStrLastSlash (const FcChar8 *path) return slash; } - + FcChar8 * FcStrDirname (const FcChar8 *file) { @@ -838,75 +905,140 @@ FcStrBasename (const FcChar8 *file) return FcStrCopy (slash + 1); } -FcStrSet * -FcStrSetCreate (void) +static FcChar8 * +FcStrCanonAbsoluteFilename (const FcChar8 *s) { - FcStrSet *set = malloc (sizeof (FcStrSet)); - if (!set) - return 0; - FcMemAlloc (FC_MEM_STRSET, sizeof (FcStrSet)); - set->ref = 1; - set->num = 0; - set->size = 0; - set->storage = FcStorageDynamic; - set->u.strs = 0; - return set; + FcChar8 *file; + FcChar8 *f; + const FcChar8 *slash; + int size; + + size = strlen ((char *) s) + 1; + file = malloc (size); + if (!file) + return NULL; + FcMemAlloc (FC_MEM_STRING, size); + slash = NULL; + f = file; + for (;;) { + if (*s == '/' || *s == '\0') + { + if (slash) + { + switch (s - slash) { + case 1: + f -= 1; /* squash // and trim final / from file */ + break; + case 2: + if (!strncmp ((char *) slash, "/.", 2)) + { + f -= 2; /* trim /. from file */ + } + break; + case 3: + if (!strncmp ((char *) slash, "/..", 3)) + { + f -= 3; /* trim /.. from file */ + while (f > file) { + if (*--f == '/') + break; + } + } + break; + } + } + slash = s; + } + if (!(*f++ = *s++)) + break; + } + return file; } -static FcChar8 * strset_buf = 0; -static int strset_buf_ptr = 0, strset_buf_count = 0; -static int * strset_idx = 0; -static int strset_idx_ptr = 0, strset_idx_count = 0; -static FcStrSet * strsets = 0; -static int strset_ptr = 0, strset_count = 0; - -void FcStrSetClearStatic() +#ifdef _WIN32 +/* + * Convert '\\' to '/' , remove double '/' + */ +static void +FcConvertDosPath (char *str) { - strset_buf = 0; strset_buf_ptr = 0; strset_buf_count = 0; - strset_idx = 0; strset_idx_ptr = 0; strset_idx_count = 0; - strsets = 0; strset_ptr = 0; strset_count = 0; -} + size_t len = strlen (str); + char *p = str; + char *dest = str; + char *end = str + len; + char last = 0; -FcChar8 * -FcStrSetGet (const FcStrSet *set, int i) -{ - int index; - switch (set->storage) + if (*p == '\\') { - case FcStorageStatic: - index = strset_idx[set->u.stridx_offset]; - if (index == -1) - return 0; - return &strset_buf[index]; - case FcStorageDynamic: - return set->u.strs[i]; - default: - return 0; + *p = '/'; + p++; + dest++; + } + while (p < end) + { + if (*p == '\\') + *p = '/'; + + if (*p != '/' + || last != '/') + { + *dest++ = *p; + } + + last = *p; + p++; } + + *dest = 0; } +#endif -FcStrSet * -FcStrSetPtrU (const FcStrSetPtr set) +FcChar8 * +FcStrCanonFilename (const FcChar8 *s) { - switch (set.storage) +#ifdef _WIN32 + FcChar8 full[FC_MAX_FILE_LEN + 2]; + int size = GetFullPathName (s, sizeof (full) -1, + full, NULL); + + if (size == 0) + perror ("GetFullPathName"); + + FcConvertDosPath (full); + return FcStrCanonAbsoluteFilename (full); +#else + if (s[0] == '/') + return FcStrCanonAbsoluteFilename (s); + else { - case FcStorageStatic: - return &strsets[set.u.stat]; - case FcStorageDynamic: - return (FcStrSet *)set.u.dyn; - default: - return 0; + FcChar8 *full; + FcChar8 *file; + + FcChar8 cwd[FC_MAX_FILE_LEN + 2]; + if (getcwd ((char *) cwd, FC_MAX_FILE_LEN) == NULL) + return NULL; + strcat ((char *) cwd, "/"); + full = FcStrPlus (cwd, s); + file = FcStrCanonAbsoluteFilename (full); + FcStrFree (full); + return file; } +#endif } -FcStrSetPtr -FcStrSetPtrCreateDynamic (const FcStrSet * set) -{ - FcStrSetPtr new; - new.storage = FcStorageDynamic; - new.u.dyn = (FcStrSet *)set; - return new; +FcStrSet * +FcStrSetCreate (void) +{ + FcStrSet *set = malloc (sizeof (FcStrSet)); + if (!set) + return 0; + FcMemAlloc (FC_MEM_STRSET, sizeof (FcStrSet)); + set->ref = 1; + set->num = 0; + set->size = 0; + set->strs = 0; + return set; } static FcBool @@ -917,32 +1049,25 @@ _FcStrSetAppend (FcStrSet *set, FcChar8 *s) FcStrFree (s); return FcTrue; } - if (set->num == set->size || set->storage == FcStorageStatic) + if (set->num == set->size) { FcChar8 **strs = malloc ((set->size + 2) * sizeof (FcChar8 *)); if (!strs) return FcFalse; FcMemAlloc (FC_MEM_STRSET, (set->size + 2) * sizeof (FcChar8 *)); - set->size = set->size + 1; - if (set->storage == FcStorageDynamic) - { - if (set->num) - memcpy (strs, set->u.strs, set->num * sizeof (FcChar8 *)); - if (set->u.strs) - free (set->u.strs); - } - else + if (set->num) + memcpy (strs, set->strs, set->num * sizeof (FcChar8 *)); + if (set->strs) { - if (set->num) - memcpy (strs, strset_idx+set->u.stridx_offset, - set->num * sizeof (FcChar8 *)); - set->storage = FcStorageDynamic; + FcMemFree (FC_MEM_STRSET, (set->size + 1) * sizeof (FcChar8 *)); + free (set->strs); } - set->u.strs = strs; + set->size = set->size + 1; + set->strs = strs; } - set->u.strs[set->num++] = s; - set->u.strs[set->num] = 0; + set->strs[set->num++] = s; + set->strs[set->num] = 0; return FcTrue; } @@ -952,7 +1077,7 @@ FcStrSetMember (FcStrSet *set, const FcChar8 *s) int i; for (i = 0; i < set->num; i++) - if (!FcStrCmp (FcStrSetGet(set, i), s)) + if (!FcStrCmp (set->strs[i], s)) return FcTrue; return FcFalse; } @@ -964,7 +1089,7 @@ FcStrSetEqual (FcStrSet *sa, FcStrSet *sb) if (sa->num != sb->num) return FcFalse; for (i = 0; i < sa->num; i++) - if (!FcStrSetMember (sb, FcStrSetGet(sa, i))) + if (!FcStrSetMember (sb, sa->strs[i])) return FcFalse; return FcTrue; } @@ -1003,15 +1128,14 @@ FcStrSetDel (FcStrSet *set, const FcChar8 *s) int i; for (i = 0; i < set->num; i++) - if (!FcStrCmp (FcStrSetGet(set, i), s)) + if (!FcStrCmp (set->strs[i], s)) { - if (set->storage == FcStorageDynamic) - FcStrFree (set->u.strs[i]); + FcStrFree (set->strs[i]); /* * copy remaining string pointers and trailing * NULL */ - memmove (FcStrSetGet(set, i), FcStrSetGet(set, i+1), + memmove (&set->strs[i], &set->strs[i+1], (set->num - i) * sizeof (FcChar8 *)); set->num--; return FcTrue; @@ -1025,122 +1149,17 @@ FcStrSetDestroy (FcStrSet *set) if (--set->ref == 0) { int i; - - if (set->storage == FcStorageDynamic) - { - for (i = 0; i < set->num; i++) - FcStrFree (set->u.strs[i]); - FcMemFree (FC_MEM_STRSET, (set->size) * sizeof (FcChar8 *)); - if (set->u.strs) - free (set->u.strs); - FcMemFree (FC_MEM_STRSET, sizeof (FcStrSet)); - } - free (set); - } -} - -static int _FcStrSetSort_helper (const void * a, const void * b) -{ - return FcStrCmp (&strset_buf[(int)a], - &strset_buf[(int)b]); -} - -void -FcStrSetSort (FcStrSet * set) -{ - switch (set->storage) - { - case FcStorageDynamic: - qsort (set->u.strs, set->num, sizeof (FcChar8 *), - (int (*)(const void *, const void *)) FcStrCmp); - break; - case FcStorageStatic: - qsort (strset_idx+set->u.stridx_offset, set->num, sizeof (int), - _FcStrSetSort_helper); - break; - default: - break; - } -} - -FcBool -FcStrSetPrepareSerialize (const FcStrSet *set) -{ - int i; - - if (!set) - return FcTrue; - - strset_count ++; - strset_idx_count += set->num; - for (i = 0; i < set->num; i++) - { - if (FcStrSetGet(set, i)) - strset_buf_count += strlen(FcStrSetGet(set, i)); - } - - return FcTrue; -} - -FcStrSetPtr -FcStrSetSerialize (FcStrSet *set) -{ - FcStrSet * new; - FcStrSetPtr newp; - int i; - - if (!strsets) - { - strsets = malloc (strset_count * sizeof(FcStrSet)); - if (!strsets) goto bail1; - strset_idx = malloc (strset_idx_count * sizeof(int)); - if (!strset_idx) goto bail2; - strset_buf = malloc (strset_buf_count * sizeof (FcChar8)); - if (!strset_buf) goto bail3; - } - - if (!set) - return FcStrSetPtrCreateDynamic(0); - newp.storage = FcStorageStatic; - newp.u.stat = strset_ptr; - - new = &strsets[strset_ptr++]; - new->ref = set->ref; - new->num = set->num; - new->size = set->num; - new->storage = FcStorageStatic; - new->u.stridx_offset = strset_idx_ptr; - for (i = 0; i < set->num; i++) - { - FcChar8 * s = FcStrSetGet(set, i); - - if (s) + for (i = 0; i < set->num; i++) + FcStrFree (set->strs[i]); + if (set->strs) { - memcpy(strset_buf+strset_buf_ptr, s, - strlen((char *)s)); - strset_idx[strset_idx_ptr++] = strset_buf_ptr; - strset_buf_ptr += strlen((char *)s)+1; + FcMemFree (FC_MEM_STRSET, (set->size + 1) * sizeof (FcChar8 *)); + free (set->strs); } - else - strset_idx[strset_idx_ptr++] = -1; + FcMemFree (FC_MEM_STRSET, sizeof (FcStrSet)); + free (set); } - - if (strset_ptr > strset_count || strset_idx_ptr > strset_idx_count) - return FcStrSetPtrCreateDynamic(0); - - // problem with multiple ptrs to the same LangSet. - // should hash LangSets or something. - // FcStrSetDestroy (set); - - return newp; - - bail3: - free (strset_idx); - bail2: - free (strsets); - bail1: - return FcStrSetPtrCreateDynamic(0); } FcStrList * @@ -1163,7 +1182,7 @@ FcStrListNext (FcStrList *list) { if (list->n >= list->set->num) return 0; - return FcStrSetGet(list->set, list->n++); + return list->set->strs[list->n++]; } void @@ -1173,3 +1192,7 @@ FcStrListDone (FcStrList *list) FcMemFree (FC_MEM_STRLIST, sizeof (FcStrList)); free (list); } + +#define __fcstr__ +#include "fcaliastail.h" +#undef __fcstr__