X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=3286ea87a089363036cabe518a98ef16151e12ca;hp=016732ae3fd9379f8ed405cd52e7e3cee281d513;hb=ec354cf583bc2838ecfac64c428d3f992681c5fc;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/file_write.c b/file_write.c
index 016732ae..3286ea87 100644
--- a/file_write.c
+++ b/file_write.c
@@ -6,8 +6,10 @@
 
 /** \file file_write.c simple output plugin for testing purposes */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <sys/time.h>
 
 #include "para.h"
 #include "list.h"
@@ -27,26 +29,43 @@ struct private_file_write_data {
 	int check_fd;
 };
 
+/*
+ * Get a random filename.
+ *
+ * This is by no means a secure way to create temporary files in a hostile
+ * directory like \p /tmp. However, we use it only for creating temp files in
+ * ~/.paraslash, for which it is OK. Result must be freed by the caller.
+ */
+__must_check __malloc static char *random_filename(void)
+{
+	char *result, *home = para_homedir();
+	struct timeval tv;
+
+	gettimeofday(&tv, NULL);
+	srandom(tv.tv_usec);
+	result = make_message("%s/.paraslash/%08lu", home,
+		para_random(99999999));
+	free(home);
+	return result;
+}
+
 static int file_write_open(struct writer_node *wn)
 {
 	struct private_file_write_data *pfwd = para_calloc(
 		sizeof(struct private_file_write_data));
 	struct file_write_args_info *conf = wn->conf;
 	char *filename;
+
 	if (conf->filename_given)
 		filename = conf->filename_arg;
-	else {
-		char *tmp = para_tmpname(), *home = para_homedir();
-		filename = make_message("%s/.paraslash/%s", home, tmp);
-		free(home);
-		free(tmp);
-	}
+	else
+		filename = random_filename();
 	wn->private_data = pfwd;
 	pfwd->fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
 	if (!conf->filename_given)
 		free(filename);
 	if (pfwd->fd >= 0)
-		return 8192;
+		return 1;
 	free(pfwd);
 	return -E_FW_OPEN;
 }
@@ -79,7 +98,7 @@ static int file_write_post_select(struct sched *s, struct writer_node *wn)
 	if (!FD_ISSET(pfwd->fd, &s->wfds))
 		return 1;
 //	PARA_INFO_LOG("writing %zd\n", *wng->loaded);
-	ret = write(pfwd->fd, wng->buf + wn->written,
+	ret = write(pfwd->fd, *wng->bufp + wn->written,
 		*wng->loaded - wn->written);
 	if (ret < 0)
 		return -E_FW_WRITE;