Write caches to first directory with permission. Valid cache in FcDirCacheOpen.

[fontconfig.git] / fc-lang / fc-lang.c

diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index ab20fd095fa523fda00e284895ea72d62971b378..b72893b944f2aa0a73a0fbf2ca7f6450fa124fa9 100644 (file)
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -37,9 +37,9 @@
  * functions are also needed in slightly modified form
  */
 
-const FcChar16 *langBankNumbers = 0;
-const FcCharLeaf       *langBankLeaves = 0;
-const int *langBankLeafIdx = 0;
+const FcChar16 langBankNumbers[1]; /* place holders so that externs resolve */
+const FcCharLeaf       langBankLeaves[1];
+const int langBankLeafIdx[1];
 
 void
 FcMemAlloc (int kind, int size)
@@ -51,8 +51,14 @@ FcMemFree (int kind, int size)
 {
 }
 
+int* _fcBankId = 0;
+int* _fcBankIdx = 0;
+FcValueList ** _fcValueLists = 0;
+FcPatternElt ** _fcPatternElts = 0;
+int FcDebugVal = 0;
+
 int
-FcCacheBankToIndex (int bank)
+FcCacheBankToIndexMTF (int bank)
 {
     return -1;
 }
@@ -77,18 +83,24 @@ static char *
 get_line (FILE *f, char *line, int *lineno)
 {
     char    *hash;
+    int            end;
     if (!fgets (line, 1024, f))
        return 0;
     ++(*lineno);
     hash = strchr (line, '#');
     if (hash)
        *hash = '\0';
+
+    end = strlen (line);
+    while (end > 0 && isspace (line[end-1]))
+      line[--end] = '\0';
+
     if (line[0] == '\0' || line[0] == '\n' || line[0] == '\032' || line[0] == '\r')
        return get_line (f, line, lineno);
     return line;
 }
 
-char   *dir = 0;
+static char    *dir = 0;
 
 static FILE *
 scanopen (char *file)
@@ -131,11 +143,11 @@ scan (FILE *f, char *file)
        if (!strncmp (line, "include", 7))
        {
            file = strchr (line, ' ');
-           while (*file == ' ')
+            if (!file)
+                fatal (line, lineno, 
+                       "invalid syntax, expected: include filename");
+           while (isspace(*file))
                file++;
-           end = strlen (file);
-           if (file[end-1] == '\n')
-               file[end-1] = '\0';
            f = scanopen (file);
            if (!f)
                fatal (file, 0, "can't open");
@@ -224,13 +236,13 @@ static int compare (const void *a, const void *b)
 int
 main (int argc, char **argv)
 {
-    char       *files[MAX_LANG];
-    FcCharSet  *sets[MAX_LANG];
-    int                duplicate[MAX_LANG];
-    int                offsets[MAX_LANG];
-    int                country[MAX_LANG];
-    char       *names[MAX_LANG];
-    char       *langs[MAX_LANG];
+    static char                *files[MAX_LANG];
+    static FcCharSet   *sets[MAX_LANG];
+    static int         duplicate[MAX_LANG];
+    static int         offsets[MAX_LANG];
+    static int         country[MAX_LANG];
+    static char                *names[MAX_LANG];
+    static char                *langs[MAX_LANG];
     FILE       *f;
     int         offset = 0;
     int                ncountry = 0;
@@ -240,9 +252,8 @@ main (int argc, char **argv)
     int                total_leaves = 0;
     int                offset_count = 0;
     int                l, sl, tl;
-    int                c;
-    char       line[1024];
-    FcChar32   map[MAX_LANG_SET_MAP];
+    static char                line[1024];
+    static FcChar32    map[MAX_LANG_SET_MAP];
     int                num_lang_set_map;
     int                setRangeStart[26];
     int                setRangeEnd[26];
@@ -444,7 +455,7 @@ main (int argc, char **argv)
 
        printf ("    { (FcChar8 *) \"%s\",\n"
                "      { FC_REF_CONSTANT, %d, FC_BANK_LANGS, "
-               "{ .stat = { %d, %d } } } }, /* %d */\n",
+               "{ { %d, %d } } } }, /* %d */\n",
                langs[i],
                sets[j]->num, offsets[j], offsets[j], j);
     }
@@ -457,6 +468,7 @@ main (int argc, char **argv)
      */
     if (ncountry)
     {
+       int     c;
        int     ncountry_ent = 0;
        printf ("\n");
        printf ("static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = {\n");
@@ -465,7 +477,7 @@ main (int argc, char **argv)
            i = country[c];
            if (i >= 0)
            {
-               int l = strchr (langs[i], '-') - langs[i];
+               int lang = strchr (langs[i], '-') - langs[i];
                int d, k;
 
                for (k = 0; k < num_lang_set_map; k++)
@@ -485,7 +497,7 @@ main (int argc, char **argv)
                for (k = 0; k < num_lang_set_map; k++)
                    printf (" 0x%08x,", map[k]);
                printf (" }, /* %*.*s */\n",
-                       l, l, langs[i]);
+                       lang, lang, langs[i]);
                ++ncountry_ent;
            }
        }