Improve error handling in fit_common

[karo-tx-uboot.git] / tools / fit_common.c

diff --git a/tools/fit_common.c b/tools/fit_common.c
index ee1767bd019a41482a924a9be07eed8ba61225ad..286f357ab1769af8c507e6c94719558800ce7a92 100644 (file)
--- a/tools/fit_common.c
+++ b/tools/fit_common.c
@@ -38,8 +38,8 @@ int fit_check_image_types(uint8_t type)
                return EXIT_FAILURE;
 }
 
-int mmap_fdt(char *cmdname, const char *fname, void **blobp,
-               struct stat *sbuf, int useunlink)
+int mmap_fdt(const char *cmdname, const char *fname, void **blobp,
+            struct stat *sbuf, bool delete_on_error)
 {
        void *ptr;
        int fd;
@@ -50,17 +50,13 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
        if (fd < 0) {
                fprintf(stderr, "%s: Can't open %s: %s\n",
                        cmdname, fname, strerror(errno));
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
        }
 
        if (fstat(fd, sbuf) < 0) {
                fprintf(stderr, "%s: Can't stat %s: %s\n",
                        cmdname, fname, strerror(errno));
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
        }
 
        errno = 0;
@@ -68,19 +64,23 @@ int mmap_fdt(char *cmdname, const char *fname, void **blobp,
        if ((ptr == MAP_FAILED) || (errno != 0)) {
                fprintf(stderr, "%s: Can't read %s: %s\n",
                        cmdname, fname, strerror(errno));
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
        }
 
        /* check if ptr has a valid blob */
        if (fdt_check_header(ptr)) {
                fprintf(stderr, "%s: Invalid FIT blob\n", cmdname);
-               if (useunlink)
-                       unlink(fname);
-               return -1;
+               goto err;
        }
 
        *blobp = ptr;
        return fd;
+
+err:
+       if (fd >= 0)
+               close(fd);
+       if (delete_on_error)
+               unlink(fname);
+
+       return -1;
 }