* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rstemp.c,v $
- * Revision 1.16 1995-11-28 14:47:02 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.
+ * New rset member: flag.
+ * Bug fix: r_delete in rsrel.c did free bad memory block.
+ *
+ * Revision 1.16 1995/11/28 14:47:02 adam
* New setting: tempSetPath. Location of temporary result sets.
*
* Revision 1.15 1995/10/12 12:41:58 adam
#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);
+static void *r_create(const struct rset_control *sel, void *parms,
+ int *flags);
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
static const rset_control control =
{
- "Temporary set",
+ "temp",
r_create,
r_open,
r_close,
struct rset_temp_rfd *next;
};
-static void *r_create(const struct rset_control *sel, void *parms)
+static void *r_create(const struct rset_control *sel, void *parms, int *flags)
{
rset_temp_parms *temp_parms = parms;
struct rset_temp_info *info;
-
+
info = xmalloc (sizeof(struct rset_temp_info));
info->fd = -1;
info->fname = NULL;
if (!temppath_init)
{
temppath_init = 1;
- temppath_root = res_get (common_resource, "tempSetPath");
+ temppath_root = res_get (common_resource, "setTmpDir");
}
return info;
}
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);
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);