X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=27e96b9c6aff080913424597a07be7cb9c657da7;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=7d99db53677c7a8e4f6c91f1b71a715f27e08187;hpb=80d4cca6f4fa7b4efbad28a2b43248f6be952f7c;p=idzebra-moved-to-github.git

diff --git a/index/dirs.c b/index/dirs.c
index 7d99db5..27e96b9 100644
--- a/index/dirs.c
+++ b/index/dirs.c
@@ -1,10 +1,27 @@
 /*
- * 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.5  1996-01-17 14:54:44  adam
+ * 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
+ * File update uses modify-time instead of change-time.
+ *
+ * Revision 1.6  1996/02/02  13:44:43  adam
+ * The public dictionary functions simply use char instead of Dict_char
+ * to represent search strings. Dict_char is used internally only.
+ *
+ * Revision 1.5  1996/01/17  14:54:44  adam
  * Function dirs_rmdir uses dict_delete.
  *
  * Revision 1.4  1995/11/30  08:34:27  adam
@@ -24,7 +41,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <ctype.h>
 
 #include <alexutil.h>
 #include "index.h"
@@ -41,7 +57,7 @@ struct dirs_info {
     struct dirs_entry *last_entry;
 };
 
-static int dirs_client_proc (Dict_char *name, const char *info, int pos,
+static int dirs_client_proc (char *name, const char *info, int pos,
                              void *client)
 {
     struct dirs_info *ci = client;
@@ -59,20 +75,20 @@ static int dirs_client_proc (Dict_char *name, const char *info, int pos,
         assert (0);
     }
     entry = ci->entries + ci->no_cur;
-    if (info[0] == sizeof(entry->sysno)+sizeof(entry->ctime))
+    if (info[0] == sizeof(entry->sysno)+sizeof(entry->mtime))
     {
         strcpy (entry->path, name + ci->prelen); 
         entry->kind = dirs_file;
         memcpy (&entry->sysno, info+1, sizeof(entry->sysno));
-        memcpy (&entry->ctime, info+1+sizeof(entry->sysno), 
-                sizeof(entry->ctime));
+        memcpy (&entry->mtime, info+1+sizeof(entry->sysno), 
+                sizeof(entry->mtime));
         ci->no_cur++;
     } 
-    else if (info[0] == sizeof(entry->ctime))
+    else if (info[0] == sizeof(entry->mtime))
     {
         strcpy (entry->path, name + ci->prelen);
         entry->kind = dirs_dir;
-        memcpy (&entry->ctime, info+1, sizeof(entry->ctime));
+        memcpy (&entry->mtime, info+1, sizeof(entry->mtime));
         ci->no_cur++;
     }
     return 0;
@@ -97,6 +113,34 @@ struct dirs_info *dirs_open (Dict dict, const char *rep)
     return p;
 }
 
+struct dirs_info *dirs_fopen (Dict dict, const char *path)
+{
+    struct dirs_info *p;
+    struct dirs_entry *entry;
+    char *info;
+
+    p = xmalloc (sizeof(*p));
+    p->dict = dict;
+    *p->prefix = '\0';
+    p->entries = xmalloc (sizeof(*p->entries));
+    p->no_read = 0;
+    p->no_cur = 0;
+    p->no_max = 2;
+
+    entry = p->entries;
+    info = dict_lookup (dict, path);
+    if (info && info[0] == sizeof(entry->sysno)+sizeof(entry->mtime))
+    {
+        strcpy (entry->path, path); 
+        entry->kind = dirs_file;
+        memcpy (&entry->sysno, info+1, sizeof(entry->sysno));
+        memcpy (&entry->mtime, info+1+sizeof(entry->sysno), 
+                sizeof(entry->mtime));
+        p->no_cur++;
+    }
+    return p;
+}
+
 struct dirs_entry *dirs_read (struct dirs_info *p)
 {
     int before = 0, after = p->no_max+1;
@@ -123,13 +167,13 @@ struct dirs_entry *dirs_last (struct dirs_info *p)
     return p->last_entry;
 }
 
-void dirs_mkdir (struct dirs_info *p, const char *src, int ctime)
+void dirs_mkdir (struct dirs_info *p, const char *src, time_t mtime)
 {
     char path[256];
 
     sprintf (path, "%s%s", p->prefix, src);
     logf (LOG_DEBUG, "dirs_mkdir %s", path);
-    dict_insert (p->dict, path, sizeof(ctime), &ctime);
+    dict_insert (p->dict, path, sizeof(mtime), &mtime);
 }
 
 void dirs_rmdir (struct dirs_info *p, const char *src)
@@ -141,7 +185,7 @@ void dirs_rmdir (struct dirs_info *p, const char *src)
     dict_delete (p->dict, path);
 }
 
-void dirs_add (struct dirs_info *p, const char *src, int sysno, int ctime)
+void dirs_add (struct dirs_info *p, const char *src, int sysno, time_t mtime)
 {
     char path[256];
     char info[16];
@@ -149,19 +193,17 @@ void dirs_add (struct dirs_info *p, const char *src, int sysno, int ctime)
     sprintf (path, "%s%s", p->prefix, src);
     logf (LOG_DEBUG, "dirs_add %s", path);
     memcpy (info, &sysno, sizeof(sysno));
-    memcpy (info+sizeof(sysno), &ctime, sizeof(ctime));
-    dict_insert (p->dict, path, sizeof(sysno)+sizeof(ctime), info);
+    memcpy (info+sizeof(sysno), &mtime, sizeof(mtime));
+    dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info);
 }
 
 void dirs_del (struct dirs_info *p, const char *src)
 {
     char path[256];
-    char info[2];
 
     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)