-/* $Id: dirs.c,v 1.24 2006-05-10 08:13:20 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: dirs.c,v 1.28 2007-10-29 09:25:40 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
int nextpath_deleted;
};
-static int dirs_client_proc (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 = (struct dirs_info *) client;
struct dirs_entry *entry;
- if (memcmp (name, ci->prefix, ci->prelen))
+ if (memcmp(name, ci->prefix, ci->prelen))
return 1;
if (ci->no_cur < 0)
{
ci->no_cur = 0;
return 0;
}
- assert (ci->no_cur < ci->no_max);
+ assert(ci->no_cur < ci->no_max);
entry = ci->entries + ci->no_cur;
if (info[0] == sizeof(entry->sysno)+sizeof(entry->mtime))
{
- strcpy (entry->path, name + ci->prelen);
+ strcpy(entry->path, name + ci->prelen);
entry->kind = dirs_file;
- memcpy (&entry->sysno, info+1, sizeof(entry->sysno));
- memcpy (&entry->mtime, info+1+sizeof(entry->sysno),
+ memcpy(&entry->sysno, info+1, sizeof(entry->sysno));
+ memcpy(&entry->mtime, info+1+sizeof(entry->sysno),
sizeof(entry->mtime));
ci->no_cur++;
}
else if (info[0] == sizeof(entry->mtime))
{
- strcpy (entry->path, name + ci->prelen);
+ strcpy(entry->path, name + ci->prelen);
entry->kind = dirs_dir;
- memcpy (&entry->mtime, info+1, sizeof(entry->mtime));
+ memcpy(&entry->mtime, info+1, sizeof(entry->mtime));
ci->no_cur++;
}
return 0;
}
-struct dirs_info *dirs_open (Dict dict, const char *rep, int rw)
+struct dirs_info *dirs_open(Dict dict, const char *rep, int rw)
{
struct dirs_info *p;
int before = 0, after;
- yaz_log (YLOG_DEBUG, "dirs_open %s", rep);
- p = (struct dirs_info *) 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);
+ strcpy(p->prefix, rep);
p->prelen = strlen(p->prefix);
- strcpy (p->nextpath, rep);
+ strcpy(p->nextpath, rep);
p->nextpath_deleted = 0;
p->no_read = p->no_cur = 0;
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);
+ 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, int rw)
+struct dirs_info *dirs_fopen(Dict dict, const char *path, int rw)
{
struct dirs_info *p;
struct dirs_entry *entry;
char *info;
- p = (struct dirs_info *) xmalloc (sizeof(*p));
+ p = (struct dirs_info *) xmalloc(sizeof(*p));
p->dict = dict;
p->rw = rw;
*p->prefix = '\0';
- p->entries = (struct dirs_entry *) 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;
entry = p->entries;
- info = dict_lookup (dict, path);
+ info = dict_lookup(dict, path);
if (info && info[0] == sizeof(entry->sysno)+sizeof(entry->mtime))
{
- strcpy (entry->path, path);
+ strcpy(entry->path, path);
entry->kind = dirs_file;
- memcpy (&entry->sysno, info+1, sizeof(entry->sysno));
- memcpy (&entry->mtime, info+1+sizeof(entry->sysno),
+ 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)
+struct dirs_entry *dirs_read(struct dirs_info *p)
{
int before = 0, after = p->no_max+1;
if (p->no_read < p->no_cur)
{
- yaz_log (YLOG_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++);
}
}
p->no_read = 1;
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);
+ 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;
}
-struct dirs_entry *dirs_last (struct dirs_info *p)
+struct dirs_entry *dirs_last(struct dirs_info *p)
{
return p->last_entry;
}
-void dirs_mkdir (struct dirs_info *p, const char *src, time_t mtime)
+void dirs_mkdir(struct dirs_info *p, const char *src, time_t mtime)
{
char path[DIRS_MAX_PATH];
- sprintf (path, "%s%s", p->prefix, src);
- yaz_log (YLOG_DEBUG, "dirs_mkdir %s", path);
+ sprintf(path, "%s%s", p->prefix, src);
+ yaz_log(YLOG_DEBUG, "dirs_mkdir %s", path);
if (p->rw)
- dict_insert (p->dict, path, sizeof(mtime), &mtime);
+ dict_insert(p->dict, path, sizeof(mtime), &mtime);
}
-void dirs_rmdir (struct dirs_info *p, const char *src)
+void dirs_rmdir(struct dirs_info *p, const char *src)
{
char path[DIRS_MAX_PATH];
- sprintf (path, "%s%s", p->prefix, src);
- yaz_log (YLOG_DEBUG, "dirs_rmdir %s", path);
+ sprintf(path, "%s%s", p->prefix, src);
+ yaz_log(YLOG_DEBUG, "dirs_rmdir %s", path);
if (p->rw)
- dict_delete (p->dict, path);
+ dict_delete(p->dict, path);
}
-void dirs_add (struct dirs_info *p, const char *src, SYSNO sysno, time_t mtime)
+void dirs_add(struct dirs_info *p, const char *src, zint sysno, time_t mtime)
{
char path[DIRS_MAX_PATH];
char info[16];
- sprintf (path, "%s%s", p->prefix, src);
- yaz_log (YLOG_DEBUG, "dirs_add %s", path);
- memcpy (info, &sysno, sizeof(sysno));
- memcpy (info+sizeof(sysno), &mtime, sizeof(mtime));
+ sprintf(path, "%s%s", p->prefix, src);
+ yaz_log(YLOG_DEBUG, "dirs_add %s", path);
+ memcpy(info, &sysno, sizeof(sysno));
+ memcpy(info+sizeof(sysno), &mtime, sizeof(mtime));
if (p->rw)
- dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info);
+ dict_insert(p->dict, path, sizeof(sysno)+sizeof(mtime), info);
}
-void dirs_del (struct dirs_info *p, const char *src)
+void dirs_del(struct dirs_info *p, const char *src)
{
char path[DIRS_MAX_PATH];
- sprintf (path, "%s%s", p->prefix, src);
- yaz_log (YLOG_DEBUG, "dirs_del %s", path);
+ sprintf(path, "%s%s", p->prefix, src);
+ 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);
+ dict_delete(p->dict, path);
}
}
-void dirs_free (struct dirs_info **pp)
+void dirs_free(struct dirs_info **pp)
{
struct dirs_info *p = *pp;
- xfree (p->entries);
- xfree (p);
+ xfree(p->entries);
+ xfree(p);
*pp = NULL;
}