Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 208 insertions, 0 deletions

diff --git a/mkfontscale/hash.c b/mkfontscale/hash.c
new file mode 100644
index 000000000..313d5b6c1
--- /dev/null
+++ b/mkfontscale/hash.c
@@ -0,0 +1,208 @@
+/*
+  Copyright (c) 2003 by Juliusz Chroboczek
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "hash.h"
+#include "list.h"
+
+#define LOG2_NUMBUCKETS 10
+#define NUMBUCKETS (1 << LOG2_NUMBUCKETS)
+
+static unsigned
+hash(char *string)
+{
+    int i;
+    unsigned u = 0;
+    for(i = 0; string[i] != '\0'; i++)
+        u = (u<<5) + (u >> (LOG2_NUMBUCKETS - 5)) + (unsigned char)string[i];
+    return (u & (NUMBUCKETS - 1));
+}
+
+static void
+strcpy_lwr(char *dst, char *src)
+{
+    while(1) {
+        *dst = tolower(*src);
+        if(*src == '\0')
+            break;
+        src++;
+        dst++;
+    }
+}
+
+HashTablePtr
+makeHashTable(void)
+{
+    return calloc(NUMBUCKETS, sizeof(HashBucketPtr));
+}
+
+void
+destroyHashTable(HashTablePtr table)
+{
+    int i;
+    HashBucketPtr bp;
+
+    for(i = 0; i < NUMBUCKETS; i++) {
+        while(table[i]) {
+            bp = table[i];
+            table[i] = table[i]->next;
+            free(bp->key);
+            free(bp->value);
+            free(bp);
+        }
+    }
+    free(table);
+}
+
+char *
+getHash(HashTablePtr table, char *key)
+{
+    int i = hash(key);
+    HashBucketPtr bp;
+    for(bp = table[i]; bp; bp = bp->next) {
+        if(strcasecmp(bp->key, key) == 0)
+            return bp->value;
+    }
+    return NULL;
+}
+
+int
+putHash(HashTablePtr table, char *key, char *value, int prio)
+{
+    int i = hash(key);
+    char *keycopy = NULL, *valuecopy = NULL;
+    HashBucketPtr bp;
+    for(bp = table[i]; bp; bp = bp->next) {
+        if(strcasecmp(bp->key, key) == 0) {
+            if(prio > bp->prio) {
+                keycopy = malloc(strlen(key) + 1);
+                if(keycopy == NULL) goto fail;
+                strcpy_lwr(keycopy, key);
+                valuecopy = malloc(strlen(value) + 1);
+                if(valuecopy == NULL) goto fail;
+                strcpy(valuecopy, value);
+                free(bp->key);
+                free(bp->value);
+                bp->key = keycopy;
+                bp->value = valuecopy;
+            }
+            return 1;
+        }
+    }
+    keycopy = malloc(strlen(key) + 1);
+    if(keycopy == NULL)
+        goto fail;
+    strcpy_lwr(keycopy, key);
+    valuecopy = malloc(strlen(value) + 1);
+    if(valuecopy == NULL)
+        goto fail;
+    strcpy(valuecopy, value);
+    bp = malloc(sizeof(HashBucketRec));
+    if(bp == NULL)
+        goto fail;
+    bp->key = keycopy;
+    bp->value = valuecopy;
+    bp->prio = prio;
+    bp->next = table[i];
+    table[i] = bp;
+    return 1;
+
+ fail:
+    if(keycopy) free(keycopy);
+    if(valuecopy) free(valuecopy);
+    return -1;
+}
+
+int
+hashElements(HashTablePtr table)
+{
+    int i, n;
+    HashBucketPtr bp;
+
+    n = 0;
+    for(i = 0; i < NUMBUCKETS; i++) {
+        for(bp = table[i]; bp; bp = bp->next) {
+            n++;
+        }
+    }
+    return n;
+}
+
+static int
+key_first_cmp(const void *v1, const void *v2)
+{
+    const HashBucketPtr *b1 = v1, *b2 = v2;
+    int c1 = strcasecmp((*b1)->key, (*b2)->key);
+    if(c1 != 0) return c1;
+    return strcmp((*b1)->value, (*b2)->value);
+}
+
+static int
+value_first_cmp(const void *v1, const void *v2)
+{
+    const HashBucketPtr *b1 = v1, *b2 = v2;
+    int c1 = strcmp((*b1)->value, (*b2)->value);
+    if(c1 != 0) return c1;
+    return strcasecmp((*b1)->key, (*b2)->key);
+}
+
+HashBucketPtr *
+hashArray(HashTablePtr table, int value_first)
+{
+    int i, j, n;
+    HashBucketPtr *dst;
+    
+    n = hashElements(table);
+    dst = malloc((n + 1) * sizeof(HashBucketPtr));
+    if(dst == NULL)
+        return NULL;
+
+    j = 0;
+    for(i = 0; i < NUMBUCKETS; i++) {
+        while(table[i]) {
+            dst[j++] = table[i];
+            table[i] = table[i]->next;
+        }
+    }
+    qsort(dst, j, sizeof(HashBucketPtr),
+          value_first ? value_first_cmp : key_first_cmp);
+    dst[j++] = NULL;
+    free(table);
+
+    return dst;
+}
+
+void
+destroyHashArray(HashBucketPtr *array)
+{
+    int i = 0;
+    while(array[i]) {
+        free(array[i]->key);
+        free(array[i]->value);
+        free(array[i]);
+        i++;
+    }
+    free(array);
+}