/*
- * Copyright (C) 1994-1996, Index Data I/S
+ * Copyright (C) 1994-2001, Index Data
* All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: dirs.c,v $
- * Revision 1.13 1997-09-09 13:38:06 adam
+ * Revision 1.17 2001-03-29 14:07:14 adam
+ * Fixed nasty bug for fileUpdate.
+ *
+ * Revision 1.16 1999/05/26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.15 1999/02/02 14:50:51 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.14 1998/01/12 15:04:07 adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.13 1997/09/09 13:38:06 adam
* Partial port to WIN95/NT.
*
* Revision 1.12 1996/11/08 11:10:13 adam
struct dirs_info {
Dict dict;
+ int rw;
int no_read;
int no_cur;
int no_max;
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))
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));
+ 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->no_read = p->no_cur = 0;
after = p->no_max = 100;
- p->entries = xmalloc (sizeof(*p->entries) * (p->no_max));
+ p->entries = (struct dirs_entry *)
+ 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_entry *entry;
char *info;
- p = xmalloc (sizeof(*p));
+ p = (struct dirs_info *) xmalloc (sizeof(*p));
p->dict = dict;
*p->prefix = '\0';
- p->entries = xmalloc (sizeof(*p->entries));
+ p->entries = (struct dirs_entry *) xmalloc (sizeof(*p->entries));
p->no_read = 0;
p->no_cur = 0;
p->no_max = 2;
logf (LOG_DEBUG, "dirs_read rescan");
dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc);
p->no_read = 1;
- if (p->no_read < p->no_cur)
+ if (p->no_read <= p->no_cur)
return p->last_entry = p->entries;
return p->last_entry = NULL;
}
sprintf (path, "%s%s", p->prefix, src);
logf (LOG_DEBUG, "dirs_mkdir %s", path);
- dict_insert (p->dict, path, sizeof(mtime), &mtime);
+ if (p->rw)
+ dict_insert (p->dict, path, sizeof(mtime), &mtime);
}
void dirs_rmdir (struct dirs_info *p, const char *src)
sprintf (path, "%s%s", p->prefix, src);
logf (LOG_DEBUG, "dirs_rmdir %s", path);
- dict_delete (p->dict, path);
+ if (p->rw)
+ dict_delete (p->dict, path);
}
void dirs_add (struct dirs_info *p, const char *src, int sysno, time_t mtime)
logf (LOG_DEBUG, "dirs_add %s", path);
memcpy (info, &sysno, sizeof(sysno));
memcpy (info+sizeof(sysno), &mtime, sizeof(mtime));
- dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info);
+ if (p->rw)
+ dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info);
}
void dirs_del (struct dirs_info *p, const char *src)
sprintf (path, "%s%s", p->prefix, src);
logf (LOG_DEBUG, "dirs_del %s", path);
- dict_delete (p->dict, path);
+ if (p->rw)
+ dict_delete (p->dict, path);
}
void dirs_free (struct dirs_info **pp)