Partial port to WIN95/NT.

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

diff --git a/rset/rstemp.c b/rset/rstemp.c
index f200e8b..aa7b9b1 100644 (file)
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.17  1995-12-11 09:15:28  adam
+ * Revision 1.20  1997-09-09 13:38:17  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.19  1997/09/04 13:58:57  adam
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.18  1996/10/29 13:54:52  adam
+ * Changed name of setting tempSetDir to setTmpDir.
+ *
+ * Revision 1.17  1995/12/11 09:15:28  adam
  * New set types: sand/sor/snot - ranked versions of and/or/not in
  * ranked/semi-ranked result sets.
  * Note: the snot not finished yet.
@@ -67,11 +76,16 @@
 
 #include <fcntl.h>
 #include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
+#include <string.h>
 #include <sys/types.h>
 #include <stdio.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <rstemp.h>
 
 static void *r_create(const struct rset_control *sel, void *parms,
@@ -141,7 +155,7 @@ static void *r_create(const struct rset_control *sel, void *parms, int *flags)
     if (!temppath_init)
     {
         temppath_init = 1;
-        temppath_root = res_get (common_resource, "tempSetPath");
+        temppath_root = res_get (common_resource, "setTmpDir");
     }
     return info;
 }
@@ -155,9 +169,9 @@ static RSFD r_open (RSET ct, int flag)
     if (info->fname)
     {
         if (flag & RSETF_WRITE)
-            info->fd = open (info->fname, O_RDWR|O_CREAT, 0666);
+            info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
         else
-            info->fd = open (info->fname, O_RDONLY);
+            info->fd = open (info->fname, O_BINARY|O_RDONLY);
         if (info->fd == -1)
         {
             logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname);
@@ -185,7 +199,7 @@ static void r_flush (RSFD rfd, int mk)
         strcpy (info->fname, s);
 
         logf (LOG_DEBUG, "creating tempfile %s", info->fname);
-        info->fd = open (info->fname, O_RDWR|O_CREAT, 0666);
+        info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
         if (info->fd == -1)
         {
             logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname);