Fix for libidzebra-2.0-dev

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

diff --git a/rset/rstemp.c b/rset/rstemp.c
index aa886be..c02121b 100644 (file)
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,8 +1,5 @@
-/* $Id: rstemp.c,v 1.67 2006-06-06 21:01:31 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,11 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <fcntl.h>
 #include <stdlib.h>
@@ -45,7 +45,7 @@ static void r_pos(RSFD rfd, double *current, double  *total);
 static void r_flush(RSFD rfd, int mk);
 static void r_reread(RSFD rfd);
 
-static const struct rset_control control = 
+static const struct rset_control control =
 {
     "temp",
     r_delete,
@@ -53,7 +53,7 @@ static const struct rset_control control =
     r_open,
     r_close,
     0, /* no forward */
-    r_pos, 
+    r_pos,
     r_read,
     r_write,
 };
@@ -106,7 +106,7 @@ RSET rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol,
         info->temp_path = NULL;
     else
         info->temp_path = nmem_strdup(rnew->nmem, temp_path);
-    rnew->priv = info; 
+    rnew->priv = info;
     return rnew;
 } /* rstemp_create */
 
@@ -137,7 +137,7 @@ static RSFD r_open(RSET ct, int flag)
         if (info->fd == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname);
-            exit(1);
+            zebra_exit("r_open");
         }
     }
     rfd = rfd_create_base(ct);
@@ -146,7 +146,7 @@ static RSFD r_open(RSET ct, int flag)
         prfd = (struct rfd_private *) nmem_malloc(ct->nmem, sizeof(*prfd));
         rfd->priv = (void *)prfd;
         prfd->buf = nmem_malloc(ct->nmem,ct->keycontrol->key_size);
-    } 
+    }
     else
         prfd= rfd->priv;
     r_flush(rfd, 0);
@@ -168,17 +168,22 @@ static void r_flush(RSFD rfd, int mk)
     {
 #if HAVE_MKSTEMP
         char template[1024];
+
+        *template = '\0';
+
         if (info->temp_path)
-            sprintf(template, "%s/zrsXXXXXX", info->temp_path);
-        else
-            sprintf(template, "zrsXXXXXX");
+            sprintf(template, "%s/", info->temp_path);
+        strcat(template, "zrs_");
+#if HAVE_UNISTD_H
+        sprintf(template + strlen(template), "%ld_", (long) getpid());
+#endif
+        strcat(template, "XXXXXX");
 
         info->fd = mkstemp(template);
-
         if (info->fd == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template);
-            exit(1);
+            zebra_exit("r_flush");
         }
        info->fname = nmem_strdup(rfd->rset->nmem, template);
 #else
@@ -190,7 +195,7 @@ static void r_flush(RSFD rfd, int mk)
         if (info->fd == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
-            exit(1);
+            zebra_exit("r_flush");
         }
 #endif
     }
@@ -198,11 +203,11 @@ static void r_flush(RSFD rfd, int mk)
     {
         size_t count;
         int r;
-        
+
         if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname);
-            exit(1);
+            zebra_exit("r_flusxh");
         }
         count = info->buf_size;
         if (count > info->pos_end - info->pos_buf)
@@ -214,7 +219,7 @@ static void r_flush(RSFD rfd, int mk)
             else
                 yaz_log(YLOG_FATAL, "rstemp: write of %ld but got %ld",
                       (long) count, (long) r);
-            exit(1);
+            zebra_exit("r_flush");
         }
         info->dirty = 0;
     }
@@ -241,7 +246,7 @@ static void r_close(RSFD rfd)
  */
 static void r_reread(RSFD rfd)
 {
-    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; 
+    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
     struct rset_private *info = (struct rset_private *)rfd->rset->priv;
 
     if (info->fname)
@@ -259,7 +264,7 @@ static void r_reread(RSFD rfd)
             if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1)
             {
                 yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (2) %s fd=%d", info->fname, info->fd);
-                exit(1);
+                zebra_exit("r_reread");
             }
             if ((r = read(info->fd, info->buf_mem, count)) < (int) count)
             {
@@ -268,7 +273,7 @@ static void r_reread(RSFD rfd)
                 else
                     yaz_log(YLOG_FATAL, "read of %ld but got %ld",
                           (long) count, (long) r);
-                exit(1);
+                zebra_exit("r_reread");
             }
         }
     }
@@ -278,7 +283,7 @@ static void r_reread(RSFD rfd)
 
 static int r_read(RSFD rfd, void *buf, TERMID *term)
 {
-    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;  
+    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
     struct rset_private *info = (struct rset_private *)rfd->rset->priv;
 
     size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
@@ -294,7 +299,7 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
     memcpy(buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf),
             rfd->rset->keycontrol->key_size);
     if (term)
-        *term = rfd->rset->term; 
+        *term = rfd->rset->term;
         /* FIXME - should we store and return terms ?? */
     mrfd->pos_cur = nc;
     mrfd->cur++;
@@ -303,7 +308,7 @@ static int r_read(RSFD rfd, void *buf, TERMID *term)
 
 static int r_write(RSFD rfd, const void *buf)
 {
-    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;  
+    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
     struct rset_private *info = (struct rset_private *)rfd->rset->priv;
 
     size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size;
@@ -327,15 +332,16 @@ static int r_write(RSFD rfd, const void *buf)
 
 static void r_pos(RSFD rfd, double  *current, double  *total)
 {
-    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;  
+    struct rfd_private *mrfd = (struct rfd_private*) rfd->priv;
     struct rset_private *info = (struct rset_private *)rfd->rset->priv;
-    
+
     *current = (double) mrfd->cur;
     *total = (double) info->hits;
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab