X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=83279a5ae54e776e28afc39f39fab06f47a45b3e;hb=c8ecacb7e0284165e2249e117a0b859d75e297f0;hp=ce6da3f43fecc6eeee8803e06ac3860007d132e0;hpb=83762ea76e5af65ccb4407c6b38053bc6491a875;p=idzebra-moved-to-github.git diff --git a/index/dirs.c b/index/dirs.c index ce6da3f..83279a5 100644 --- a/index/dirs.c +++ b/index/dirs.c @@ -4,7 +4,21 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: dirs.c,v $ - * Revision 1.2 1995-11-20 11:56:23 adam + * 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 @@ -31,7 +45,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; @@ -74,22 +88,14 @@ 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; @@ -97,7 +103,7 @@ struct dirs_info *dirs_open (Dict dict, const char *rep) 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 +113,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); @@ -137,12 +139,10 @@ void dirs_mkdir (struct dirs_info *p, const char *src, int ctime) 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) @@ -172,8 +172,8 @@ void dirs_free (struct dirs_info **pp) { struct dirs_info *p = *pp; - free (p->entries); - free (p); + xfree (p->entries); + xfree (p); *pp = NULL; }