X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.c;h=1269dded35b73960c6b3d51c00efcd1b6e6aaafa;hp=0c8cc8b0d4c1a84596c66ab1f27073cff5446435;hb=6e5cd61065181460be8152a73dfc79f94ecd27fe;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa

diff --git a/discover/paths.c b/discover/paths.c
index 0c8cc8b..1269dde 100644
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -6,6 +6,8 @@
 #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>
@@ -49,9 +51,12 @@ char *join_paths(void *alloc_ctx, const char *a, const char *b)
 static char *local_name(void *ctx)
 {
 	char *ret, tmp[] = "/tmp/pb-XXXXXX";
+	mode_t oldmask;
 	int fd;
 
+	oldmask = umask(0644);
 	fd = mkstemp(tmp);
+	umask(oldmask);
 
 	if (fd < 0)
 		return NULL;
@@ -86,7 +91,7 @@ static void load_url_process_exit(struct process *process)
 
 	if (result->status == LOAD_CANCELLED) {
 		load_url_result_cleanup_local(result);
-	} else if (process->exit_status == 0) {
+	} else if (process_exit_ok(process)) {
 		result->status = LOAD_OK;
 	} else {
 		result->status = LOAD_ERROR;
@@ -131,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;
 	}
@@ -217,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;
 
@@ -306,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;