X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=61764524d8c1d1aa917047269f70c4e745a7fb8a;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=27e96b9c6aff080913424597a07be7cb9c657da7;hpb=f4c557cfebb4fa779a858c7d305081d4d92578da;p=idzebra-moved-to-github.git

diff --git a/index/dirs.c b/index/dirs.c
index 27e96b9..6176452 100644
--- a/index/dirs.c
+++ b/index/dirs.c
@@ -1,10 +1,31 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dirs.c,v $
- * Revision 1.10  1996-06-04 10:18:58  adam
+ * Revision 1.16  1999-05-26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.15  1999/02/02 14:50:51  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.14  1998/01/12 15:04:07  adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * 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
@@ -38,21 +59,24 @@
  * Started work on virtual directory structure.
  */
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 
-#include <alexutil.h>
 #include "index.h"
 
+#define DIRS_MAX_PATH 1024
+
 struct dirs_info {
     Dict dict;
+    int rw;
     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;
 };
@@ -60,7 +84,7 @@ struct dirs_info {
 static int dirs_client_proc (char *name, const char *info, int pos,
                              void *client)
 {
-    struct dirs_info *ci = client;
+    struct dirs_info *ci = (struct dirs_info *) client;
     struct dirs_entry *entry;
 
     if (memcmp (name, ci->prefix, ci->prelen))
@@ -94,20 +118,22 @@ static int dirs_client_proc (char *name, const char *info, int pos,
     return 0;
 }
 
-struct dirs_info *dirs_open (Dict dict, const char *rep)
+struct dirs_info *dirs_open (Dict dict, const char *rep, int rw)
 {
     struct dirs_info *p;
     int before = 0, after;
 
     logf (LOG_DEBUG, "dirs_open %s", rep);
-    p = xmalloc (sizeof (*p));
+    p = (struct dirs_info *) xmalloc (sizeof (*p));
     p->dict = dict;
+    p->rw = rw;
     strcpy (p->prefix, rep);
     p->prelen = strlen(p->prefix);
     strcpy (p->nextpath, rep);
     p->no_read = p->no_cur = 0;
-    after = p->no_max = 400;
-    p->entries = xmalloc (sizeof(*p->entries) * (p->no_max));
+    after = p->no_max = 100;
+    p->entries = (struct dirs_entry *)
+	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);
     return p;
@@ -119,10 +145,10 @@ struct dirs_info *dirs_fopen (Dict dict, const char *path)
     struct dirs_entry *entry;
     char *info;
 
-    p = xmalloc (sizeof(*p));
+    p = (struct dirs_info *) xmalloc (sizeof(*p));
     p->dict = dict;
     *p->prefix = '\0';
-    p->entries = xmalloc (sizeof(*p->entries));
+    p->entries = (struct dirs_entry *) xmalloc (sizeof(*p->entries));
     p->no_read = 0;
     p->no_cur = 0;
     p->no_max = 2;
@@ -169,41 +195,45 @@ 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);
-    dict_insert (p->dict, path, sizeof(mtime), &mtime);
+    if (p->rw)
+	dict_insert (p->dict, path, sizeof(mtime), &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);
-    dict_delete (p->dict, path);
+    if (p->rw)
+	dict_delete (p->dict, path);
 }
 
 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);
     logf (LOG_DEBUG, "dirs_add %s", path);
     memcpy (info, &sysno, sizeof(sysno));
     memcpy (info+sizeof(sysno), &mtime, sizeof(mtime));
-    dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info);
+    if (p->rw)
+	dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info);
 }
 
 void dirs_del (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_del %s", path);
-    dict_delete (p->dict, path);
+    if (p->rw)
+	dict_delete (p->dict, path);
 }
 
 void dirs_free (struct dirs_info **pp)