Extract uses file descriptors instead of FILE pointers.

[idzebra-moved-to-github.git] / index / extract.c

diff --git a/index/extract.c b/index/extract.c
index 3560d13..8464bb4 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.12  1995-09-28 14:22:56  adam
+ * Revision 1.15  1995-10-02 15:42:53  adam
+ * Extract uses file descriptors instead of FILE pointers.
+ *
+ * Revision 1.14  1995/10/02  15:29:13  adam
+ * More logging in file_extract.
+ *
+ * Revision 1.13  1995/09/29  14:01:39  adam
+ * Bug fixes.
+ *
+ * Revision 1.12  1995/09/28  14:22:56  adam
  * Sort uses smaller temporary files.
  *
  * Revision 1.11  1995/09/28  12:10:31  adam
@@ -67,22 +76,6 @@ static size_t ptr_i;
 static size_t kused;
 static int key_file_no;
 
-static int sort_compare (const void *p1, const void *p2)
-{
-    int r;
-    size_t l;
-    char *cp1 = *(char**) p1;
-    char *cp2 = *(char**) p2;
-
-    if ((r = strcmp (cp1, cp2)))
-        return r;
-    l = strlen(cp1); 
-    if ((r = key_compare (cp1+l, cp2+l)))
-        return r;
-    return cp1[l+sizeof(struct it_key)] -
-           cp2[l+sizeof(struct it_key)];
-}
-
 void key_open (int mem)
 {
     void *file_key;
@@ -123,10 +116,9 @@ void key_flush (void)
 
     key_file_no++;
     logf (LOG_LOG, "sorting section %d", key_file_no);
-    qsort (key_buf + ptr_top-ptr_i, ptr_i, sizeof(char*), sort_compare);
+    qsort (key_buf + ptr_top-ptr_i, ptr_i, sizeof(char*), key_qsort_compare);
     sprintf (out_fname, TEMP_FNAME, key_file_no);
 
-
     if (!(outf = fopen (out_fname, "w")))
     {
         logf (LOG_FATAL|LOG_ERRNO, "fopen (4) %s", out_fname);
@@ -211,27 +203,29 @@ static void wordAdd (const RecWord *p)
     default:
         return ;
     }
+    ((char*) key_buf)[kused++] = ((key_cmd == 'a') ? 1 : 0);
     key.sysno = key_sysno;
     key.seqno = p->seqno;
     memcpy ((char*)key_buf + kused, &key, sizeof(key));
     kused += sizeof(key);
+}
 
-    ((char*) key_buf)[kused++] = ((key_cmd == 'a') ? 1 : 0);
+static int file_read (int fd, char *buf, size_t count)
+{
+    return read (fd, buf, count);
 }
 
 void file_extract (int cmd, const char *fname, const char *kname)
 {
-    int i;
+    int i, r;
     char ext[128];
     SYSNO sysno;
     char ext_res[128];
     const char *file_type;
     void *file_info;
-    FILE *inf;
     struct recExtractCtrl extractCtrl;
     RecType rt;
 
-    logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
     for (i = strlen(fname); --i >= 0; )
         if (fname[i] == '/')
         {
@@ -248,6 +242,7 @@ void file_extract (int cmd, const char *fname, const char *kname)
         return;
     if (!(rt = recType_byName (file_type)))
         return;
+    logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
     file_info = dict_lookup (file_idx, kname);
     if (!file_info)
     {
@@ -260,17 +255,19 @@ void file_extract (int cmd, const char *fname, const char *kname)
     else
         memcpy (&sysno, (char*) file_info+1, sizeof(sysno));
 
-    if (!(inf = fopen (fname, "r")))
+    if ((extractCtrl.fd = open (fname, O_RDONLY)) == -1)
     {
         logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
         return;
     }
-    extractCtrl.inf = inf;
     extractCtrl.subType = "";
     extractCtrl.init = wordInit;
     extractCtrl.add = wordAdd;
+    extractCtrl.readf = file_read;
     key_sysno = sysno;
     key_cmd = cmd;
-    (*rt->extract)(&extractCtrl);
-    fclose (inf);
+    r = (*rt->extract)(&extractCtrl);
+    close (extractCtrl.fd);
+    if (r)
+        logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
 }