More robusst comment-ignoring in kboot parser.

[petitboot] / devices / kboot-parser.c

diff --git a/devices/kboot-parser.c b/devices/kboot-parser.c
index ef1f247b8b39ffd5ce879220d314933ca7ebf5d2..448575929abc1fa9e7e3cefbe13ab4a64dbc9f59 100644 (file)
--- a/devices/kboot-parser.c
+++ b/devices/kboot-parser.c
@@ -106,6 +106,7 @@ static int parse_option(struct boot_option *opt, char *config)
        opt->boot_image_file = join_paths(mountpoint, config);
 
        cmdline = malloc(buf_size);
+       *cmdline = 0;
 
        for (pos++; pos;) {
                pos = get_param_pair(pos, &name, &value, ' ');
@@ -147,7 +148,7 @@ static int parse_option(struct boot_option *opt, char *config)
                cmdline = tmp;
        }
 
-       printf("kboot cmdline: %s", cmdline);
+       pb_log("kboot cmdline: %s", cmdline);
        opt->boot_args = cmdline;
 
        asprintf(&opt->description, "%s %s", config, cmdline);
@@ -165,11 +166,14 @@ static void parse_buf(struct device *dev, char *buf)
 
                pos = get_param_pair(pos, &name, &value, '\n');
 
-               printf("kboot param: '%s' = '%s'\n", name, value);
+               pb_log("kboot param: '%s' = '%s'\n", name, value);
 
                if (name == NULL || param_is_ignored(name))
                        continue;
 
+               if (*name == '#')
+                       continue;
+
                memset(&opt, 0, sizeof(opt));
                opt.name = strdup(name);