X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=559ff978e79d27719c43723a2505314e5c5478db;hb=c325477904a47c61586ad9b756b9280c22351c6b;hp=ce6da3f43fecc6eeee8803e06ac3860007d132e0;hpb=83762ea76e5af65ccb4407c6b38053bc6491a875;p=idzebra-moved-to-github.git diff --git a/index/dirs.c b/index/dirs.c index ce6da3f..559ff97 100644 --- a/index/dirs.c +++ b/index/dirs.c @@ -1,10 +1,40 @@ /* - * 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.2 1995-11-20 11:56:23 adam + * 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. + * + * 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 + * Started work on commit facility. + * Changed a few malloc/free to xmalloc/xfree. + * + * Revision 1.3 1995/11/20 16:59:45 adam + * New update method: the 'old' keys are saved for each records. + * + * Revision 1.2 1995/11/20 11:56:23 adam * Work on new traversal. * * Revision 1.1 1995/11/17 15:54:42 adam @@ -14,9 +44,7 @@ #include #include #include -#include -#include #include "index.h" struct dirs_info { @@ -31,7 +59,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; @@ -49,20 +77,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; @@ -74,30 +102,50 @@ struct dirs_info *dirs_open (Dict dict, const char *rep) int before = 0, after; logf (LOG_DEBUG, "dirs_open %s", rep); - if (!(p = malloc (sizeof (*p)))) - { - logf (LOG_FATAL|LOG_ERRNO, "malloc"); - exit (1); - } + p = xmalloc (sizeof (*p)); p->dict = dict; 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; - if (!(p->entries = malloc (sizeof(*p->entries) * (p->no_max)))) - { - logf (LOG_FATAL|LOG_ERRNO, "malloc"); - exit (1); - } + 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; + int before = 0, after = p->no_max+1; if (p->no_read < p->no_cur) { @@ -107,10 +155,6 @@ struct dirs_entry *dirs_read (struct dirs_info *p) } if (p->no_cur < p->no_max) return p->last_entry = NULL; -#if 0 - strcpy (p->nextpath, p->prefix); - strcat (p->nextpath, (p->entries + p->no_max-1)->path); -#endif p->no_cur = -1; logf (LOG_DEBUG, "dirs_read rescan"); dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc); @@ -125,27 +169,25 @@ 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) { char path[256]; - char info[2]; sprintf (path, "%s%s", p->prefix, src); logf (LOG_DEBUG, "dirs_rmdir %s", path); - info[0] = 'r'; - dict_insert (p->dict, path, 1, info); + 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]; @@ -153,27 +195,25 @@ 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) { struct dirs_info *p = *pp; - free (p->entries); - free (p); + xfree (p->entries); + xfree (p); *pp = NULL; }