X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=c5636eee6813206e6694fa7924d86a9436404686;hb=0b5d38bc84d5261aaed3bce3be748c5d7008f2ff;hp=83279a5ae54e776e28afc39f39fab06f47a45b3e;hpb=c8ecacb7e0284165e2249e117a0b859d75e297f0;p=idzebra-moved-to-github.git diff --git a/index/dirs.c b/index/dirs.c index 83279a5..c5636ee 100644 --- a/index/dirs.c +++ b/index/dirs.c @@ -1,10 +1,32 @@ /* - * 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.6 1996-02-02 13:44:43 adam + * 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 + * 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. * @@ -28,19 +50,19 @@ #include #include #include -#include -#include #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; }; @@ -63,20 +85,20 @@ static int dirs_client_proc (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; @@ -94,13 +116,41 @@ 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); 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; @@ -127,45 +177,43 @@ 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]; + 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(ctime), &ctime); + 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); } -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 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), &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]; + 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)