discover: Separate temporary and permanent device data

[petitboot] / discover / parser-conf.c

diff --git a/discover/parser-conf.c b/discover/parser-conf.c
index 6926a92a3fc3b836f51353ec71d3f9b920c43812..247e29d734fdea083ee508216271a6103b62b019 100644 (file)
--- a/discover/parser-conf.c
+++ b/discover/parser-conf.c
@@ -74,11 +74,12 @@ char *conf_replace_char(char *s, char from, char to)
 }
 
 /**
- * conf_get_param_pair - Get the next 'name=value' parameter pair.
+ * conf_get_pair - Get the next 'name/value' parameter pair.
  * @str: The string to process.
  * @name_out: Returns a pointer to the name.
  * @value_out: Returns a pointer to the value.
- * @terminator: The pair separator/terminator.
+ * @tdelimiter: The pair separator.
+ * @terminator: The pair terminator.
  *
  * Parses a name=value pair returning pointers in @name_out and @value_out.
  * The pair can be terminated by @terminator or a zero.
@@ -91,18 +92,27 @@ char *conf_replace_char(char *s, char from, char to)
  * string.
  */
 
-char *conf_get_param_pair(char *str, char **name_out, char **value_out,
-               char terminator)
+char *conf_get_pair(struct conf_context __attribute__((unused)) *conf, char *str,
+       char **name_out, char **value_out, char delimiter, char terminator)
 {
        char *sep, *end;
 
+       *name_out = *value_out = NULL;
+
        /* terminate the value */
        end = strchr(str, terminator);
 
        if (end)
                *end = 0;
 
-       sep = strchr(str, '=');
+       conf_replace_char(str, '\t', ' ');
+
+       str = conf_strip_str(str);
+
+       if (!str)
+               goto exit;
+
+       sep = strchr(str, delimiter);
 
        if (!sep) {
                *name_out = NULL;
@@ -113,6 +123,7 @@ char *conf_get_param_pair(char *str, char **name_out, char **value_out,
                *value_out = conf_strip_str(sep + 1);
        }
 
+exit:
        pb_log("%s: @%s@%s@\n", __func__, *name_out, *value_out);
 
        return end ? end + 1 : NULL;
@@ -144,6 +155,9 @@ void conf_init_global_options(struct conf_context *conf)
 {
        int i;
 
+       if (!conf->global_options)
+               return;
+
        for (i = 0; conf->global_options[i].name; i++)
                conf->global_options[i].value = NULL;
 }
@@ -160,6 +174,8 @@ int conf_set_global_option(struct conf_context *conf, const char *name,
 {
        int i;
 
+       assert(conf->global_options);
+
        for (i = 0; conf->global_options[i].name; i++) {
                if (streq(name, conf->global_options[i].name)) {
                        conf->global_options[i].value
@@ -185,6 +201,8 @@ const char *conf_get_global_option(struct conf_context *conf,
 {
        int i;
 
+       assert(conf->global_options);
+
        for (i = 0; conf->global_options[i].name ;i++)
                if (streq(name, conf->global_options[i].name)) {
                        pb_log("%s: @%s@%s@\n", __func__, name,
@@ -206,8 +224,11 @@ static void conf_parse_buf(struct conf_context *conf)
 {
        char *pos, *name, *value;
 
+       assert(conf->get_pair);
+       assert(conf->process_pair);
+
        for (pos = conf->buf; pos;) {
-               pos = conf_get_param_pair(pos, &name, &value, '\n');
+               pos = conf->get_pair(conf, pos, &name, &value, '\n');
 
                if (!value)
                        continue;
@@ -234,6 +255,7 @@ static void conf_parse_buf(struct conf_context *conf)
 
 int conf_parse(struct conf_context *conf)
 {
+       struct device *dev;
        int fd, rc;
        unsigned int i;
        struct stat stat;
@@ -248,7 +270,7 @@ int conf_parse(struct conf_context *conf)
 
        for (i = 0; conf->conf_files[i]; i++) {
                char *filepath = resolve_path(conf->dc,
-                       conf->conf_files[i], conf->dc->device_path);
+                       conf->conf_files[i], conf->dc->device->device_path);
 
                pb_log("%s: try: %s\n", __func__, filepath);
 
@@ -288,8 +310,9 @@ int conf_parse(struct conf_context *conf)
        if (len <= 0)
                goto out;
 
-       if (!conf->dc->device->icon_file)
-               conf->dc->device->icon_file = talloc_strdup(conf->dc,
+       dev = conf->dc->device->device;
+       if (!dev->icon_file)
+               dev->icon_file = talloc_strdup(dev,
                        generic_icon_file(guess_device_type(conf->dc)));
 
        conf_parse_buf(conf);