projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimize for C source code
[idzebra-moved-to-github.git]
/
index
/
trav.c
diff --git
a/index/trav.c
b/index/trav.c
index
4d02b5e
..
a2786fc
100644
(file)
--- a/
index/trav.c
+++ b/
index/trav.c
@@
-1,4
+1,4
@@
-/* $Id: trav.c,v 1.48 2005-05-09 19:57:35 adam Exp $
+/* $Id: trav.c,v 1.50 2006-04-05 02:11:44 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-27,7
+27,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <io.h>
#define S_ISREG(x) (x & _S_IFREG)
#define S_ISDIR(x) (x & _S_IFDIR)
#include <io.h>
#define S_ISREG(x) (x & _S_IFREG)
#define S_ISDIR(x) (x & _S_IFDIR)
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <direntz.h>
#include <unistd.h>
#endif
#include <direntz.h>
@@
-69,7
+70,7
@@
static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
switch (e[i].kind)
{
case dirs_file:
switch (e[i].kind)
{
case dirs_file:
- fileExtract (zh, NULL, rep, deleteFlag);
+ zebra_extract_file (zh, NULL, rep, deleteFlag);
break;
case dirs_dir:
repositoryExtractR (zh, deleteFlag, rep, level+1);
break;
case dirs_dir:
repositoryExtractR (zh, deleteFlag, rep, level+1);
@@
-93,7
+94,7
@@
static void fileDeleteR (ZebraHandle zh,
{
case dirs_file:
sprintf (tmppath, "%s%s", base, dst->path);
{
case dirs_file:
sprintf (tmppath, "%s%s", base, dst->path);
- fileExtract (zh, &dst->sysno, tmppath, 1);
+ zebra_extract_file (zh, &dst->sysno, tmppath, 1);
strcpy (tmppath, dst->path);
dst = dirs_read (di);
strcpy (tmppath, dst->path);
dst = dirs_read (di);
@@
-190,7
+191,7
@@
static void fileUpdateR (ZebraHandle zh,
case dirs_file:
if (e_src[i_src].mtime > dst->mtime)
{
case dirs_file:
if (e_src[i_src].mtime > dst->mtime)
{
- if (fileExtract (zh, &dst->sysno, tmppath, 0))
+ if (zebra_extract_file (zh, &dst->sysno, tmppath, 0) == ZEBRA_OK)
{
dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
}
{
dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
}
@@
-218,7
+219,7
@@
static void fileUpdateR (ZebraHandle zh,
switch (e_src[i_src].kind)
{
case dirs_file:
switch (e_src[i_src].kind)
{
case dirs_file:
- if (fileExtract (zh, &sysno, tmppath, 0))
+ if (zebra_extract_file (zh, &sysno, tmppath, 0) == ZEBRA_OK)
dirs_add (di, src, sysno, e_src[i_src].mtime);
break;
case dirs_dir:
dirs_add (di, src, sysno, e_src[i_src].mtime);
break;
case dirs_dir:
@@
-237,7
+238,7
@@
static void fileUpdateR (ZebraHandle zh,
switch (dst->kind)
{
case dirs_file:
switch (dst->kind)
{
case dirs_file:
- fileExtract (zh, &dst->sysno, tmppath, 1);
+ zebra_extract_file (zh, &dst->sysno, tmppath, 1);
dirs_del (di, dst->path);
dst = dirs_read (di);
break;
dirs_del (di, dst->path);
dst = dirs_read (di);
break;
@@
-318,13
+319,13
@@
static void fileUpdate (ZebraHandle zh, Dict dict, const char *path)
if (e_dst)
{
if (sbuf.st_mtime > e_dst->mtime)
if (e_dst)
{
if (sbuf.st_mtime > e_dst->mtime)
- if (fileExtract (zh, &e_dst->sysno, src, 0))
+ if (zebra_extract_file (zh, &e_dst->sysno, src, 0) == ZEBRA_OK)
dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
}
else
{
SYSNO sysno = 0;
dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
}
else
{
SYSNO sysno = 0;
- if (fileExtract (zh, &sysno, src, 0))
+ if (zebra_extract_file (zh, &sysno, src, 0) == ZEBRA_OK)
dirs_add (di, src, sysno, sbuf.st_mtime);
}
dirs_free (&di);
dirs_add (di, src, sysno, sbuf.st_mtime);
}
dirs_free (&di);
@@
-371,7
+372,7
@@
static void repositoryExtract (ZebraHandle zh,
if (ret == -1)
yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
else if (S_ISREG(sbuf.st_mode))
if (ret == -1)
yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
else if (S_ISREG(sbuf.st_mode))
- fileExtract (zh, NULL, src, deleteFlag);
+ zebra_extract_file (zh, NULL, src, deleteFlag);
else if (S_ISDIR(sbuf.st_mode))
repositoryExtractR (zh, deleteFlag, src, 0);
else
else if (S_ISDIR(sbuf.st_mode))
repositoryExtractR (zh, deleteFlag, src, 0);
else