X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=74c93aa1d5142ff15c1070fa9dbbfa872acf7d03;hb=ce20a8a823a2df86ace4862008684c71a4f06cd2;hp=7c592004dc857065c2adfca9dd170d749da0cb37;hpb=0e816d23119c75153727b17b418066792d2ce8c8;p=idzebra-moved-to-github.git diff --git a/index/dir.c b/index/dir.c index 7c59200..74c93aa 100644 --- a/index/dir.c +++ b/index/dir.c @@ -1,10 +1,22 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1995, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dir.c,v $ - * Revision 1.2 1995-09-01 10:57:07 adam + * Revision 1.6 1995-09-08 14:52:26 adam + * Minor changes. Dictionary is lower case now. + * + * Revision 1.5 1995/09/06 16:11:16 adam + * Option: only one word key per file. + * + * Revision 1.4 1995/09/04 12:33:41 adam + * Various cleanup. YAZ util used instead. + * + * Revision 1.3 1995/09/01 14:06:35 adam + * Split of work into more files. + * + * Revision 1.2 1995/09/01 10:57:07 adam * Minor changes. * * Revision 1.1 1995/09/01 10:34:51 adam @@ -20,49 +32,52 @@ #include #include -#include +#include #include "index.h" struct dir_entry *dir_open (const char *rep) { DIR *dir; struct dirent *dent; - size_t entry_max = 20; + size_t entry_max = 50; size_t idx = 0; struct dir_entry *entry; - log (LOG_DEBUG, "dir_open %s", rep); + logf (LOG_LOG, "dir_open %s", rep); if (!(dir = opendir(rep))) { - log (LOG_WARN|LOG_ERRNO, "opendir %s", rep); + logf (LOG_WARN|LOG_ERRNO, "opendir %s", rep); if (errno != ENOENT) exit (1); return NULL; } if (!(entry = malloc (sizeof(*entry) * entry_max))) { - log (LOG_FATAL|LOG_ERRNO, "malloc"); + logf (LOG_FATAL|LOG_ERRNO, "malloc"); exit (1); } while ((dent = readdir (dir))) { + if (strcmp (dent->d_name, ".") == 0 || + strcmp (dent->d_name, "..") == 0) + continue; if (idx == entry_max-1) { struct dir_entry *entry_n; - if (!(entry_n = malloc (sizeof(*entry) * (entry_max + 100)))) + if (!(entry_n = malloc (sizeof(*entry) * (entry_max + 400)))) { - log (LOG_FATAL|LOG_ERRNO, "malloc"); + logf (LOG_FATAL|LOG_ERRNO, "malloc"); exit (1); } - memcpy (entry_n, entry, entry_max * sizeof(*entry)); + memcpy (entry_n, entry, idx * sizeof(*entry)); free (entry); entry = entry_n; entry_max += 100; } if (!(entry[idx].name = malloc (strlen(dent->d_name)+1))) { - log (LOG_FATAL|LOG_ERRNO, "malloc"); + logf (LOG_FATAL|LOG_ERRNO, "malloc"); exit (1); } strcpy (entry[idx].name, dent->d_name);