X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=3d88cfbf91186a9e94747ec05a2621b05b2e5d93;hb=01d68c3e68001168758afc0c4ffd101a7c5cf149;hp=1d396875cfd7cbc982657cea787a73b4ac217cda;hpb=f1a944fbdac20e88bf55918f2a4f66c301d684e2;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 1d39687..3d88cfb 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,10 +1,26 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: rstemp.c,v 1.30 2002-03-20 20:24:30 adam Exp $
- */
+/* $Id: rstemp.c,v 1.34 2003-03-18 08:53:35 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
 
 #include <fcntl.h>
 #include <assert.h>
@@ -121,6 +137,7 @@ static RSFD r_open (RSET ct, int flag)
     r_rewind (rfd);
 
     rfd->countp = &ct->rset_terms[0]->count;
+    *rfd->countp = 0;
     rfd->buf = xmalloc (info->key_size);
 
     return rfd;
@@ -138,7 +155,10 @@ static void r_flush (RSFD rfd, int mk)
 #if HAVE_MKSTEMP
         char template[1024];
 
-        sprintf (template, "%s/zrsXXXXXX", info->temp_path);
+        if (info->temp_path)
+            sprintf (template, "%s/zrsXXXXXX", info->temp_path);
+        else
+            sprintf (template, "zrsXXXXXX");
 
         info->fd = mkstemp (template);