/*
- * Copyright (C) 1994-1995, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dir.c,v $
- * Revision 1.14 1996-04-09 06:49:18 adam
+ * Revision 1.21 1999-05-26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.20 1999/02/02 14:50:50 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.19 1998/11/03 10:16:11 adam
+ * Uses stat and not lstat so that file traversal follows symbolic links.
+ *
+ * Revision 1.18 1997/09/25 14:55:33 adam
+ * Windows port uses stat and not lstat.
+ *
+ * Revision 1.17 1997/09/09 13:38:06 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.16 1996/10/29 14:06:45 adam
+ * Include zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.15 1996/06/04 10:18:58 adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.14 1996/04/09 06:49:18 adam
* Traversal of directories doesn't follow symbolic links.
*
* Revision 1.13 1996/03/21 14:50:08 adam
#include <stdio.h>
#include <string.h>
#include <assert.h>
+#ifndef WIN32
#include <unistd.h>
-#include <dirent.h>
+#endif
+#include <direntz.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
-#include <ctype.h>
-#include <alexutil.h>
#include "index.h"
struct dir_entry *dir_open (const char *rep)
exit (1);
return NULL;
}
- entry = xmalloc (sizeof(*entry) * entry_max);
+ entry = (struct dir_entry *) xmalloc (sizeof(*entry) * entry_max);
strcpy (path, rep);
pathpos = strlen(path);
if (!pathpos || path[pathpos-1] != '/')
{
struct dir_entry *entry_n;
- entry_n = xmalloc (sizeof(*entry) * (entry_max += 1000));
+ entry_n = (struct dir_entry *)
+ xmalloc (sizeof(*entry) * (entry_max += 1000));
memcpy (entry_n, entry, idx * sizeof(*entry));
xfree (entry);
entry = entry_n;
}
strcpy (path + pathpos, dent->d_name);
- lstat (path, &finfo);
+ stat (path, &finfo);
switch (finfo.st_mode & S_IFMT)
{
case S_IFREG:
entry[idx].kind = dirs_file;
entry[idx].mtime = finfo.st_mtime;
- entry[idx].name = xmalloc (strlen(dent->d_name)+1);
+ entry[idx].name = (char *) xmalloc (strlen(dent->d_name)+1);
strcpy (entry[idx].name, dent->d_name);
idx++;
break;
case S_IFDIR:
entry[idx].kind = dirs_dir;
entry[idx].mtime = finfo.st_mtime;
- entry[idx].name = xmalloc (strlen(dent->d_name)+2);
+ entry[idx].name = (char *) xmalloc (strlen(dent->d_name)+2);
strcpy (entry[idx].name, dent->d_name);
strcat (entry[idx].name, "/");
idx++;