Fix random bytes in string in kboot parser

[petitboot] / devices / yaboot-parser.c

diff --git a/devices/yaboot-parser.c b/devices/yaboot-parser.c
index ee1b992dca0b17e56edee06af3fc4687828c1d53..23249509cdd04b18329f36bf590fd0ff29fb02cf 100644 (file)
--- a/devices/yaboot-parser.c
+++ b/devices/yaboot-parser.c
@@ -1,5 +1,5 @@
 
-#include "udev-helper.h"
+#include "parser.h"
 #include "params.h"
 #include "yaboot-cfg.h"
 
@@ -86,20 +86,6 @@ make_params(char *label, char *params)
      return buffer;
 }
 
-static char *prepend_mountpoint(const char *path)
-{
-       char *full_path;
-
-       full_path = malloc(strlen(path) + strlen(mountpoint) + 2);
-
-       strcpy(full_path, mountpoint);
-       if (path[0] != '/')
-               strcat(full_path, "/");
-       strcat(full_path, path);
-
-       return full_path;
-}
-
 static int check_and_add_device(struct device *dev)
 {
        if (!dev->icon_file)
@@ -117,13 +103,13 @@ void process_image(char *label)
 
        opt.name = label;
        cfgopt = cfg_get_strg(label, "image");
-       opt.boot_image_file = prepend_mountpoint(cfgopt);
+       opt.boot_image_file = join_paths(mountpoint, cfgopt);
        if (cfgopt == defimage)
-               printf("This one is default. What do we do about it?\n");
+               pb_log("This one is default. What do we do about it?\n");
 
        cfgopt = cfg_get_strg(label, "initrd");
        if (cfgopt)
-               opt.initrd_file = prepend_mountpoint(cfgopt);
+               opt.initrd_file = join_paths(mountpoint, cfgopt);
 
        opt.boot_args = make_params(label, NULL);
 
@@ -145,12 +131,12 @@ static int yaboot_parse(const char *devicepath, const char *_mountpoint)
 
        mountpoint = _mountpoint;
 
-       filepath = prepend_mountpoint("/etc/yaboot.conf");
+       filepath = join_paths(mountpoint, "/etc/yaboot.conf");
 
        fd = open(filepath, O_RDONLY);
        if (fd < 0) {
                free(filepath);
-               filepath = prepend_mountpoint("/yaboot.conf");
+               filepath = join_paths(mountpoint, "/yaboot.conf");
                fd = open(filepath, O_RDONLY);
                
                if (fd < 0)
@@ -178,7 +164,7 @@ static int yaboot_parse(const char *devicepath, const char *_mountpoint)
        close(fd);
        
        if (cfg_parse(filepath, conf_file, conf_len)) {
-               printf("Error parsing yaboot.conf\n");
+               pb_log("Error parsing yaboot.conf\n");
                return 0;
        }
 
@@ -221,7 +207,7 @@ static int yaboot_parse(const char *devicepath, const char *_mountpoint)
                           yet. And on removal, unmount_device() only unmounts
                           it once, while in fact it may be mounted twice. */
                        if (mount_device(new_dev, partition_mntpoint)) {
-                               printf("Error mounting image partition\n");
+                               pb_log("Error mounting image partition\n");
                                return 0;
                        }
                        mountpoint = partition_mntpoint;