lib/fold: Add support for multibyte strings

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 98dc045b2c656cf85f0130b42d237dcbbf639d01..1f6f7250df8c4104b5e5f2f6a95e4f0feee53647 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -19,6 +19,7 @@
 
 static const char *partition = "common";
 static const char *sysparams_dir = "/sys/firmware/opal/sysparams/";
+static const char *devtree_dir = "/proc/device-tree/";
 
 struct param {
        char                    *name;
@@ -36,6 +37,7 @@ static const char *known_params[] = {
        "petitboot,network",
        "petitboot,timeout",
        "petitboot,bootdev",
+       "petitboot,language",
        "petitboot,debug?",
        NULL,
 };
@@ -422,6 +424,9 @@ static void populate_config(struct platform_powerpc *platform,
                }
        }
 
+       val = get_param(platform, "petitboot,language");
+       config->lang = val ? talloc_strdup(config, val) : NULL;
+
        populate_network_config(platform, config);
 
        populate_bootdev_config(platform, config);
@@ -554,6 +559,9 @@ static int update_config(struct platform_powerpc *platform,
        if (tmp)
                talloc_free(tmp);
 
+       val = config->lang ?: "";
+       update_string_config(platform, "petitboot,language", val);
+
        update_network_config(platform, config);
 
        update_bootdev_config(platform, config);
@@ -748,16 +756,20 @@ static int save_config(struct platform *p, struct config *config)
 static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
 {
        struct platform_powerpc *platform = p->platform_data;
+       char *buf, *filename;
        int len, rc;
-       char *buf;
 
-       rc = read_file(platform, "/proc/device_tree/model", &buf, &len);
+       filename = talloc_asprintf(platform, "%smodel", devtree_dir);
+       rc = read_file(platform, filename, &buf, &len);
        if (rc == 0)
                sysinfo->type = talloc_steal(sysinfo, buf);
+       talloc_free(filename);
 
-       rc = read_file(platform, "/proc/device_tree/system-id", &buf, &len);
+       filename = talloc_asprintf(platform, "%ssystem-id", devtree_dir);
+       rc = read_file(platform, filename, &buf, &len);
        if (rc == 0)
                sysinfo->identifier = talloc_steal(sysinfo, buf);
+       talloc_free(filename);
 
        return 0;
 }