xfree/xmalloc used everywhere.

[idzebra-moved-to-github.git] / rset / rstemp.c

diff --git a/rset/rstemp.c b/rset/rstemp.c
index e7a0a4c..39456ef 100644 (file)
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.8  1995-09-08 14:52:42  adam
+ * Revision 1.12  1995-09-28 09:52:11  adam
+ * xfree/xmalloc used everywhere.
+ *
+ * Revision 1.11  1995/09/18  14:17:56  adam
+ * Bug fixes.
+ *
+ * Revision 1.10  1995/09/15  14:45:39  adam
+ * Bug fixes.
+ *
+ * Revision 1.9  1995/09/15  09:20:42  adam
+ * Bug fixes.
+ *
+ * Revision 1.8  1995/09/08  14:52:42  adam
  * Work on relevance feedback.
  *
  * Revision 1.7  1995/09/07  13:58:44  adam
@@ -69,14 +81,14 @@ const rset_control *rset_kind_temp = &control;
 struct rset_temp_info {
     int     fd;
     char   *fname;
-    size_t  key_size;
-    char   *buf_mem;
-    size_t  buf_size;
-    size_t  pos_end;
-    size_t  pos_cur;
-    size_t  pos_buf;
-    size_t  pos_border;
-    int     dirty;
+    size_t  key_size;      /* key size */
+    char   *buf_mem;       /* window buffer */
+    size_t  buf_size;      /* size of window */
+    size_t  pos_end;       /* last position in set */
+    size_t  pos_cur;       /* current position in set */
+    size_t  pos_buf;       /* position of first byte in window */
+    size_t  pos_border;    /* position of last byte+1 in window */
+    int     dirty;         /* window is dirty */
 };
 
 struct rset_temp_rfd {
@@ -99,7 +111,7 @@ static struct rset_control *r_create(const struct rset_control *sel,
     info->fd = -1;
     info->fname = NULL;
     info->key_size = temp_parms->key_size;
-    info->buf_size = 1024;
+    info->buf_size = 4096;
     info->buf_mem = xmalloc (info->buf_size);
     info->pos_cur = 0;
     info->pos_end = 0;
@@ -129,10 +141,13 @@ static RSFD r_open (struct rset_control *ct, int wflag)
     }
     rfd = xmalloc (sizeof(*rfd));
     rfd->info = info;
-    r_rewind (ct);
+    r_rewind (rfd);
     return rfd;
 }
 
+/* r_flush:
+      flush current window to file if file is assocated with set
+ */
 static void r_flush (RSFD rfd, int mk)
 {
     struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info;
@@ -144,6 +159,7 @@ static void r_flush (RSFD rfd, int mk)
         info->fname = xmalloc (strlen(s)+1);
         strcpy (info->fname, s);
 
+        logf (LOG_DEBUG, "creating tempfile %s", info->fname);
         info->fd = open (info->fname, O_RDWR|O_CREAT, 0666);
         if (info->fd == -1)
         {
@@ -192,14 +208,23 @@ static void r_delete (struct rset_control *ct)
 {
     struct rset_temp_info *info = ct->buf;
 
-    r_close (ct);
     if (info->fname)
         unlink (info->fname);        
     free (info->buf_mem);
-    free (info->fname);
+    logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end);
+    if (info->fname)
+    {
+        logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
+        unlink (info->fname);
+        free (info->fname);
+    }
     free (info);
 }
 
+/* r_reread:
+      read from file to window if file is assocated with set -
+      indicated by fname
+ */
 static void r_reread (RSFD rfd)
 {
     struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
@@ -213,6 +238,12 @@ static void r_reread (RSFD rfd)
             info->pos_border = info->pos_end;
         count = info->pos_border - info->pos_buf;
         if (count > 0)
+        {
+            if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
+            {
+                logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+                exit (1);
+            }
             if ((r = read (info->fd, info->buf_mem, count)) < count)
             {
                 if (r == -1)
@@ -222,6 +253,7 @@ static void r_reread (RSFD rfd)
                           (long) count, (long) r);
                 exit (1);
             }
+        }
     }
     else
         info->pos_border = info->pos_end;
@@ -274,12 +306,15 @@ static int r_write (RSFD rfd, const void *buf)
     {
         r_flush (rfd, 1);
         info->pos_buf = info->pos_cur;
-        r_reread (rfd);
+        if (info->pos_buf < info->pos_end)
+            r_reread (rfd);
     }
+    info->dirty = 1;
     memcpy (info->buf_mem + (info->pos_cur - info->pos_buf), buf,
             info->key_size);
-    info->dirty = 1;
-    info->pos_border = info->pos_cur = nc;
+    info->pos_cur = nc;
+    if (nc > info->pos_end)
+        info->pos_border = info->pos_end = nc;
     return 1;
 }