Resouce name can be terminated with either white-space or colon.

[idzebra-moved-to-github.git] / index / dirs.c

diff --git a/index/dirs.c b/index/dirs.c
index a5f13c4..4497e6a 100644 (file)
--- a/index/dirs.c
+++ b/index/dirs.c
@@ -1,10 +1,29 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dirs.c,v $
- * Revision 1.8  1996-04-12 07:02:21  adam
+ * Revision 1.13  1997-09-09 13:38:06  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.12  1996/11/08 11:10:13  adam
+ * Buffers used during file match got bigger.
+ * Compressed ISAM support everywhere.
+ * Bug fixes regarding masking characters in queries.
+ * Redesigned Regexp-2 queries.
+ *
+ * Revision 1.11  1996/10/29 14:06:47  adam
+ * Include zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.10  1996/06/04 10:18:58  adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.9  1996/04/23  12:39:07  adam
+ * Bug fix: In function dirs_del dict_delete is used to remove a file
+ * rather than a bogus dict_insert.
+ *
+ * Revision 1.8  1996/04/12  07:02:21  adam
  * File update of single files.
  *
  * Revision 1.7  1996/03/21 14:50:09  adam
@@ -31,22 +50,23 @@
  * Started work on virtual directory structure.
  */
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <ctype.h>
 
-#include <alexutil.h>
 #include "index.h"
 
+#define DIRS_MAX_PATH 1024
+
 struct dirs_info {
     Dict dict;
     int no_read;
     int no_cur;
     int no_max;
     struct dirs_entry *entries;
-    char nextpath[256];
-    char prefix[256];
+    char nextpath[DIRS_MAX_PATH];
+    char prefix[DIRS_MAX_PATH];
     int prelen;
     struct dirs_entry *last_entry;
 };
@@ -100,7 +120,7 @@ struct dirs_info *dirs_open (Dict dict, const char *rep)
     p->prelen = strlen(p->prefix);
     strcpy (p->nextpath, rep);
     p->no_read = p->no_cur = 0;
-    after = p->no_max = 400;
+    after = p->no_max = 100;
     p->entries = xmalloc (sizeof(*p->entries) * (p->no_max));
     logf (LOG_DEBUG, "dirs_open first scan");
     dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
@@ -163,7 +183,7 @@ struct dirs_entry *dirs_last (struct dirs_info *p)
 
 void dirs_mkdir (struct dirs_info *p, const char *src, time_t mtime)
 {
-    char path[256];
+    char path[DIRS_MAX_PATH];
 
     sprintf (path, "%s%s", p->prefix, src);
     logf (LOG_DEBUG, "dirs_mkdir %s", path);
@@ -172,7 +192,7 @@ void dirs_mkdir (struct dirs_info *p, const char *src, time_t mtime)
 
 void dirs_rmdir (struct dirs_info *p, const char *src)
 {
-    char path[256];
+    char path[DIRS_MAX_PATH];
 
     sprintf (path, "%s%s", p->prefix, src);
     logf (LOG_DEBUG, "dirs_rmdir %s", path);
@@ -181,7 +201,7 @@ void dirs_rmdir (struct dirs_info *p, const char *src)
 
 void dirs_add (struct dirs_info *p, const char *src, int sysno, time_t mtime)
 {
-    char path[256];
+    char path[DIRS_MAX_PATH];
     char info[16];
 
     sprintf (path, "%s%s", p->prefix, src);
@@ -193,13 +213,11 @@ void dirs_add (struct dirs_info *p, const char *src, int sysno, time_t mtime)
 
 void dirs_del (struct dirs_info *p, const char *src)
 {
-    char path[256];
-    char info[2];
+    char path[DIRS_MAX_PATH];
 
     sprintf (path, "%s%s", p->prefix, src);
     logf (LOG_DEBUG, "dirs_del %s", path);
-    info[0] = 'r';
-    dict_insert (p->dict, path, 1, info);
+    dict_delete (p->dict, path);
 }
 
 void dirs_free (struct dirs_info **pp)