-/* $Id: rstemp.c,v 1.68 2006-08-14 10:40:21 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: rstemp.c,v 1.71 2007-01-15 15:10:19 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
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);
{
#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
if (info->fd == -1)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
- exit(1);
+ zebra_exit("r_flush");
}
#endif
}
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)
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;
}
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)
{
else
yaz_log(YLOG_FATAL, "read of %ld but got %ld",
(long) count, (long) r);
- exit(1);
+ zebra_exit("r_reread");
}
}
}