Bug fix: insert didn't work on 8-bit characters due to unsigned char

[idzebra-moved-to-github.git] / dict / insert.c

diff --git a/dict/insert.c b/dict/insert.c
index d43572c..5ec6d4c 100644 (file)
--- a/dict/insert.c
+++ b/dict/insert.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: insert.c,v $
- * Revision 1.12  1995-09-06 10:34:44  adam
+ * Revision 1.15  1996-02-01 20:39:59  adam
+ * Bug fix: insert didn't work on 8-bit characters due to unsigned char
+ * compares in dict_strcmp (strcmp) and signed Dict_char. Dict_char is
+ * unsigned now.
+ *
+ * Revision 1.14  1995/12/07  11:48:56  adam
+ * Insert operation obeys DICT_type = 1 (slack in page).
+ * Function dict_open exists if page size or magic aren't right.
+ *
+ * Revision 1.13  1995/11/28  09:06:37  adam
+ * Fixed potential dangling pointer.
+ *
+ * Revision 1.12  1995/09/06  10:34:44  adam
  * Memcpy in clean_page edited to satisfy checkergcc.
  *
  * Revision 1.11  1995/09/04  12:33:31  adam
@@ -92,7 +104,7 @@ static int split_page (Dict dict, Dict_ptr ptr, void *p)
     void *subp;
     char *info_here;
     Dict_ptr subptr;
-    int i;
+    int i, j;
     short *indxp, *best_indxp = NULL;
     Dict_char best_char = 0;
     Dict_char prev_char = 0;
@@ -131,19 +143,22 @@ static int split_page (Dict dict, Dict_ptr ptr, void *p)
     if (best_no < 0) /* we didn't find any tail string entry at all! */
         return -1;
 
+    j = best_indxp - (short*) p;
     subptr = new_page (dict, ptr, &subp);
     /* scan entries to see if there is a string with */
     /* length 1. info_here indicates if such entry exist */
     info_here = NULL;
-    for (indxp=best_indxp, i=0; i<best_no; i++, indxp++)
+    for (i=0; i<best_no; i++, j++)
     {
         char *info, *info1;
         int slen;
-
-        assert (*indxp > 0);
+        Dict_char dc;
         
-        info = (char*) p + *indxp;                    /* entry start */
-        assert (*info == best_char);
+
+        info = (char*) p + ((short*) p)[j];
+        /* entry start */
+        memcpy (&dc, info, sizeof(dc));
+        assert (dc == best_char);
         slen = dict_strlen(info);
 
         assert (slen > 0);
@@ -408,6 +423,11 @@ static int dict_ins (Dict dict, const Dict_char *str,
     if (DICT_size(p)+slen+userlen >=
         DICT_pagesize(dict) - (1+DICT_nodir(p))*sizeof(short)) /* overflow? */
     {
+        if (DICT_type(p))
+        {
+            clean_page (dict, ptr, p, NULL, 0, NULL);
+            return dict_ins (dict, str, ptr, userlen, userinfo);
+        }
         split_page (dict, ptr, p);
         return dict_ins (dict, str, ptr, userlen, userinfo);
     }