lib/process: replace pb_run_cmd_pipe

[petitboot] / lib / pb-config / storage-powerpc-nvram.c

diff --git a/lib/pb-config/storage-powerpc-nvram.c b/lib/pb-config/storage-powerpc-nvram.c
index e6bf7df5544408900d5b1c24fc0f9d608a076798..7c8b9e156dfc6a1e4540d24fc3bc4c61f689d52d 100644 (file)
--- a/lib/pb-config/storage-powerpc-nvram.c
+++ b/lib/pb-config/storage-powerpc-nvram.c
@@ -7,6 +7,7 @@
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
+#include <process/process.h>
 
 #include "pb-config.h"
 #include "storage.h"
@@ -117,64 +118,35 @@ static int parse_nvram_params(struct powerpc_nvram_storage *nv,
 
 static int parse_nvram(struct powerpc_nvram_storage *nv)
 {
-       int rc, len, buf_len;
-       int pipefds[2], status;
-       char *buf;
-       pid_t pid;
-
-       rc = pipe(pipefds);
-       if (rc) {
-               perror("pipe");
-               return -1;
-       }
-
-       pid = fork();
-
-       if (pid < 0) {
-               perror("fork");
-               return -1;
-       }
-
-       if (pid == 0) {
-               close(STDIN_FILENO);
-               close(pipefds[0]);
-               dup2(pipefds[1], STDOUT_FILENO);
-               execlp("nvram", "nvram", "--print-config",
-                               "--partition", partition, NULL);
-               exit(EXIT_FAILURE);
-       }
-
-       close(pipefds[1]);
-
-       len = 0;
-       buf_len = max_partition_size;
-       buf = talloc_array(nv, char, buf_len);
-
-       for (;;) {
-               rc = read(pipefds[0], buf + len, buf_len - len);
+       struct process *process;
+       const char *argv[5];
+       int rc;
 
-               if (rc < 0) {
-                       perror("read");
-                       break;
-               }
+       argv[0] = "nvram";
+       argv[1] = "--print-config";
+       argv[2] = "--partition";
+       argv[3] = partition;
+       argv[4] = NULL;
 
-               if (rc == 0)
-                       break;
+       process = process_create(nv);
+       process->path = "nvram";
+       process->argv = argv;
+       process->keep_stdout = true;
 
-               len += rc;
-       }
+       rc = process_run_sync(process);
 
-       waitpid(pid, &status, 0);
-       if (!WIFEXITED(status) || WEXITSTATUS(status)) {
+       if (rc || !WIFEXITED(process->exit_status)
+                       || WEXITSTATUS(process->exit_status)) {
                fprintf(stderr, "nvram process returned "
                                "non-zero exit status\n");
-               return -1;
+               rc = -1;
+       } else {
+               rc = parse_nvram_params(nv, process->stdout_buf,
+                                           process->stdout_len);
        }
 
-       if (rc < 0)
-               return rc;
-
-       return parse_nvram_params(nv, buf, len);
+       process_release(process);
+       return rc;
 }
 
 static const char *get_param(struct powerpc_nvram_storage *nv,
@@ -243,7 +215,7 @@ static int parse_one_interface_config(struct config *config,
        } else if (!strcmp(tok, "static")) {
                ifconf->method = CONFIG_METHOD_STATIC;
 
-               /* ip/mask, [optional] gateway, [optional] dns */
+               /* ip/mask, [optional] gateway */
                tok = strtok_r(NULL, ",", &saveptr);
                if (!tok)
                        goto out_err;
@@ -254,13 +226,8 @@ static int parse_one_interface_config(struct config *config,
                if (tok) {
                        ifconf->static_config.gateway =
                                talloc_strdup(ifconf, tok);
-                       tok = strtok_r(NULL, ",", &saveptr);
                }
 
-               if (tok) {
-                       ifconf->static_config.dns =
-                               talloc_strdup(config, tok);
-               }
        } else {
                pb_log("Unknown network configuration method %s\n", tok);
                goto out_err;
@@ -279,6 +246,27 @@ out_err:
        return -1;
 }
 
+static int parse_one_dns_config(struct config *config,
+               char *confstr)
+{
+       char *tok, *saveptr;
+
+       for (tok = strtok_r(confstr, ",", &saveptr); tok;
+                       tok = strtok_r(NULL, ",", &saveptr)) {
+
+               char *server = talloc_strdup(config, tok);
+
+               config->network.dns_servers = talloc_realloc(config,
+                               config->network.dns_servers, const char *,
+                               ++config->network.n_dns_servers);
+
+               config->network.dns_servers[config->network.n_dns_servers - 1]
+                               = server;
+       }
+
+       return 0;
+}
+
 static void populate_network_config(struct powerpc_nvram_storage *nv,
                struct config *config)
 {
@@ -299,7 +287,10 @@ static void populate_network_config(struct powerpc_nvram_storage *nv,
                if (!tok)
                        break;
 
-               parse_one_interface_config(config, tok);
+               if (!strncasecmp(tok, "dns,", strlen("dns,")))
+                       parse_one_dns_config(config, tok + strlen("dns,"));
+               else
+                       parse_one_interface_config(config, tok);
 
        }