-/*
- * Copyright (C) 1994-1995, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: dirs.c,v $
- * 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
- * Started work on virtual directory structure.
- */
+/* $Id: dirs.c,v 1.22 2005-01-15 19:38:25 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
#include <stdio.h>
+#include <string.h>
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
-#include <ctype.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;
+ int nextpath_deleted;
};
-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;
+ struct dirs_info *ci = (struct dirs_info *) client;
struct dirs_entry *entry;
if (memcmp (name, ci->prefix, ci->prelen))
ci->no_cur = 0;
return 0;
}
- if (ci->no_cur == ci->no_max)
- {
- assert (0);
- }
+ assert (ci->no_cur < ci->no_max);
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;
}
-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));
+ yaz_log (YLOG_DEBUG, "dirs_open %s", rep);
+ 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->nextpath_deleted = 0;
p->no_read = p->no_cur = 0;
- after = p->no_max = 400;
- p->entries = xmalloc (sizeof(*p->entries) * (p->no_max));
- logf (LOG_DEBUG, "dirs_open first scan");
+ after = p->no_max = 100;
+ p->entries = (struct dirs_entry *)
+ xmalloc (sizeof(*p->entries) * (p->no_max));
+ yaz_log (YLOG_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 = (struct dirs_info *) xmalloc (sizeof(*p));
+ p->dict = dict;
+ *p->prefix = '\0';
+ p->entries = (struct dirs_entry *) 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;
if (p->no_read < p->no_cur)
{
- logf (LOG_DEBUG, "dirs_read %d. returns %s", p->no_read,
+ yaz_log (YLOG_DEBUG, "dirs_read %d. returns %s", p->no_read,
(p->entries + p->no_read)->path);
return p->last_entry = p->entries + (p->no_read++);
}
if (p->no_cur < p->no_max)
return p->last_entry = NULL;
- p->no_cur = -1;
- logf (LOG_DEBUG, "dirs_read rescan");
- dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
+ if (p->nextpath_deleted)
+ {
+ p->no_cur = 0;
+ after = p->no_max;
+ }
+ else
+ {
+ p->no_cur = -1;
+ after = p->no_max + 1;
+ }
p->no_read = 1;
- if (p->no_read < p->no_cur)
+ p->nextpath_deleted = 0;
+ yaz_log (YLOG_DEBUG, "dirs_read rescan %s", p->nextpath);
+ dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
+ if (p->no_read <= p->no_cur)
return p->last_entry = p->entries;
return p->last_entry = NULL;
}
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);
+ yaz_log (YLOG_DEBUG, "dirs_mkdir %s", path);
+ 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 info[2];
+ char path[DIRS_MAX_PATH];
sprintf (path, "%s%s", p->prefix, src);
- logf (LOG_DEBUG, "dirs_rmdir %s", path);
- info[0] = 'r';
- dict_insert (p->dict, path, 1, info);
+ yaz_log (YLOG_DEBUG, "dirs_rmdir %s", path);
+ if (p->rw)
+ 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, SYSNO 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);
+ yaz_log (YLOG_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));
+ 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 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);
+ yaz_log (YLOG_DEBUG, "dirs_del %s", path);
+ if (p->rw)
+ {
+ if (!strcmp(path, p->nextpath))
+ p->nextpath_deleted = 1;
+ dict_delete (p->dict, path);
+ }
}
void dirs_free (struct dirs_info **pp)