X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.c;h=1269dded35b73960c6b3d51c00efcd1b6e6aaafa;hp=c352ca02e4e214f2607b32abbc6a00857e7056c4;hb=03eba1d68dbf7ffc9690d73f957c33b8f492e627;hpb=384d406380d8bf164ed2ca3879488cc4974239be

diff --git a/discover/paths.c b/discover/paths.c
index c352ca0..1269dde 100644
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -1,8 +1,13 @@
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
+#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <talloc/talloc.h>
 #include <system/system.h>
@@ -45,15 +50,20 @@ char *join_paths(void *alloc_ctx, const char *a, const char *b)
 
 static char *local_name(void *ctx)
 {
-	char *tmp, *ret;
+	char *ret, tmp[] = "/tmp/pb-XXXXXX";
+	mode_t oldmask;
+	int fd;
 
-	tmp = tempnam(NULL, "pb-");
+	oldmask = umask(0644);
+	fd = mkstemp(tmp);
+	umask(oldmask);
 
-	if (!tmp)
+	if (fd < 0)
 		return NULL;
 
+	close(fd);
+
 	ret = talloc_strdup(ctx, tmp);
-	free(tmp);
 
 	return ret;
 }
@@ -79,9 +89,14 @@ static void load_url_process_exit(struct process *process)
 	data = task->async_data;
 	cb = task->async_cb;
 
-	result->status = process->exit_status == 0 ? LOAD_OK : LOAD_ERROR;
-	if (result->status == LOAD_ERROR)
+	if (result->status == LOAD_CANCELLED) {
 		load_url_result_cleanup_local(result);
+	} else if (process_exit_ok(process)) {
+		result->status = LOAD_OK;
+	} else {
+		result->status = LOAD_ERROR;
+		load_url_result_cleanup_local(result);
+	}
 
 	/* The load callback may well free the ctx, which was the
 	 * talloc parent of the task. Therefore, we want to do our cleanup
@@ -89,6 +104,7 @@ static void load_url_process_exit(struct process *process)
 	 */
 	process_release(process);
 	talloc_free(task);
+	result->task = NULL;
 
 	cb(result, data);
 }
@@ -120,7 +136,10 @@ static void load_process_to_local_file(struct load_task *task,
 		task->result->status = rc ? LOAD_ERROR : LOAD_ASYNC;
 	} else {
 		rc = process_run_sync(task->process);
-		task->result->status = rc ? LOAD_ERROR : LOAD_OK;
+		if (rc || !process_exit_ok(task->process))
+			task->result->status = LOAD_ERROR;
+		else
+			task->result->status = LOAD_OK;
 		process_release(task->process);
 		task->process = NULL;
 	}
@@ -206,14 +225,16 @@ static enum tftp_type check_tftp_type(void *ctx)
 	const char *argv[] = { pb_system_apps.tftp, "-V", NULL };
 	struct process *process;
 	enum tftp_type type;
+	int rc;
 
 	process = process_create(ctx);
 	process->path = pb_system_apps.tftp;
 	process->argv = argv;
 	process->keep_stdout = true;
-	process_run_sync(process);
+	process->add_stderr = true;
+	rc = process_run_sync(process);
 
-	if (!process->stdout_buf || process->stdout_len == 0) {
+	if (rc || !process->stdout_buf || process->stdout_len == 0) {
 		pb_log("Can't check TFTP client type!\n");
 		type = TFTP_TYPE_BROKEN;
 
@@ -295,8 +316,9 @@ static void load_wget(struct load_task *task, int flags)
 		pb_system_apps.wget,
 		"-O",
 		NULL, /* 2: local file */
-		NULL,
-		NULL,
+		NULL, /* 3 (optional): --quiet */
+		NULL, /* 4 (optional): --no-check-certificate */
+		NULL, /* 5: URL */
 		NULL,
 	};
 	int i;
@@ -359,6 +381,7 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
 	task->url = url;
 	task->async = async_cb != NULL;
 	task->result = talloc_zero(ctx, struct load_url_result);
+	task->result->task = task;
 	task->process = process_create(task);
 	if (task->async) {
 		task->async_cb = async_cb;
@@ -407,3 +430,22 @@ struct load_url_result *load_url(void *ctx, struct pb_url *url)
 {
 	return load_url_async(ctx, url, NULL, NULL);
 }
+
+void load_url_async_cancel(struct load_url_result *res)
+{
+	struct load_task *task = res->task;
+
+	/* the completion callback may have already been called; this clears
+	 * res->task */
+	if (!task)
+		return;
+
+	if (res->status == LOAD_CANCELLED)
+		return;
+
+	assert(task->async);
+	assert(task->process);
+
+	res->status = LOAD_CANCELLED;
+	process_stop_async(task->process);
+}