lib/efi: Cleanup read/write routines

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index ed5733eb6166f79d7a7dac2d802df8811381cdd1..2ee376d0d9fa29d641e55f5948e2c7f9bcf79a20 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -4,9 +4,9 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <asm/byteorder.h>
 
@@ -16,6 +16,7 @@
 #include <log/log.h>
 #include <process/process.h>
 #include <types/types.h>
+#include <url/url.h>
 
 #include "hostboot.h"
 #include "platform.h"
@@ -147,7 +148,7 @@ static int parse_nvram_params(struct platform_powerpc *platform,
 
 static int parse_nvram(struct platform_powerpc *platform)
 {
-       struct process *process;
+       struct process_stdout *stdout;
        const char *argv[5];
        int rc;
 
@@ -157,23 +158,17 @@ static int parse_nvram(struct platform_powerpc *platform)
        argv[3] = partition;
        argv[4] = NULL;
 
-       process = process_create(platform);
-       process->path = "nvram";
-       process->argv = argv;
-       process->keep_stdout = true;
-
-       rc = process_run_sync(process);
+       rc = process_get_stdout_argv(NULL, &stdout, argv);
 
-       if (rc || !process_exit_ok(process)) {
+       if (rc) {
                fprintf(stderr, "nvram process returned "
                                "non-zero exit status\n");
                rc = -1;
        } else {
-               rc = parse_nvram_params(platform, process->stdout_buf,
-                                           process->stdout_len);
+               rc = parse_nvram_params(platform, stdout->buf, stdout->len);
        }
 
-       process_release(process);
+       talloc_free(stdout);
        return rc;
 }
 
@@ -287,7 +282,7 @@ static int parse_one_interface_config(struct config *config,
                char *confstr)
 {
        struct interface_config *ifconf;
-       char *tok, *saveptr;
+       char *tok, *tok_gw, *tok_url, *saveptr;
 
        ifconf = talloc_zero(config, struct interface_config);
 
@@ -320,18 +315,26 @@ static int parse_one_interface_config(struct config *config,
                ifconf->static_config.address =
                        talloc_strdup(ifconf, tok);
 
-               tok = strtok_r(NULL, ",", &saveptr);
-               if (tok) {
-                       ifconf->static_config.gateway =
-                               talloc_strdup(ifconf, tok);
+               /*
+                * If a url is set but not a gateway, we can accidentally
+                * interpret the url as the gateway. To avoid changing the
+                * parameter format check if the "gateway" is actually a
+                * pb-url if it's the last token.
+                */
+               tok_gw = strtok_r(NULL, ",", &saveptr);
+               tok_url = strtok_r(NULL, ",", &saveptr);
+
+               if (tok_gw) {
+                       if (tok_url || !is_url(tok_gw))
+                               ifconf->static_config.gateway =
+                                       talloc_strdup(ifconf, tok_gw);
+                       else
+                                       tok_url = tok_gw;
                }
 
-               tok = strtok_r(NULL, ",", &saveptr);
-               if (tok) {
+               if (tok_url)
                        ifconf->static_config.url =
-                               talloc_strdup(ifconf, tok);
-               }
-
+                               talloc_strdup(ifconf, tok_url);
        } else {
                pb_log("Unknown network configuration method %s\n", tok);
                goto out_err;
@@ -1184,7 +1187,7 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
        memcpy(&cookie, &resp[i], sizeof(cookie));
        cookie = __be32_to_cpu(cookie);
        if (cookie != magic_value) {
-               pb_log("%s: Incorrect cookie %x\n", __func__, cookie);
+               pb_log_fn("Incorrect cookie %x\n", cookie);
                return;
        }
        i += sizeof(cookie);
@@ -1250,7 +1253,7 @@ static int load_config(struct platform *p, struct config *config)
 
        rc = parse_nvram(platform);
        if (rc)
-               pb_log("%s: Failed to parse nvram\n", __func__);
+               pb_log_fn("Failed to parse nvram\n");
 
        populate_config(platform, config);