]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
tools/mkimage: Fix DTC run command to handle file names with space
authorMirza, Taimoor <Taimoor_Mirza@mentor.com>
Wed, 4 Oct 2017 15:28:03 +0000 (20:28 +0500)
committerTom Rini <trini@konsulko.com>
Mon, 16 Oct 2017 13:42:51 +0000 (09:42 -0400)
fit_handle_file function does not quote input and output files while preparing
command to run DTC to convert .its to .itb. This results in a failure if input
or output files contain spaces in their names. Quote input and output files in
DTC command to avoid this failure.

Signed-off-by: Mirza, Taimoor <Taimoor_Mirza@mentor.com>
tools/fit_image.c

index 30257b178e274b0024c2a775d03dc9e6d5ba9fa1..6dcc88bae00f7f149ed741b84ed5d8812ce61c1a 100644 (file)
@@ -651,11 +651,11 @@ static int fit_handle_file(struct image_tool_params *params)
                *cmd = '\0';
        } else if (params->datafile) {
                /* dtc -I dts -O dtb -p 500 datafile > tmpfile */
-               snprintf(cmd, sizeof(cmd), "%s %s %s > %s",
+               snprintf(cmd, sizeof(cmd), "%s %s \"%s\" > \"%s\"",
                         MKIMAGE_DTC, params->dtc, params->datafile, tmpfile);
                debug("Trying to execute \"%s\"\n", cmd);
        } else {
-               snprintf(cmd, sizeof(cmd), "cp %s %s",
+               snprintf(cmd, sizeof(cmd), "cp \"%s\" \"%s\"",
                         params->imagefile, tmpfile);
        }
        if (*cmd && system(cmd) == -1) {