]> git.sur5r.net Git - u-boot/blobdiff - tools/mkimage.c
License cleanup: remove unintended "All Rights Reserved" notices.
[u-boot] / tools / mkimage.c
index 8ced9709a63b62f6b717b2e0eecd12bcf89f10bf..7fd9fd1aeb88abb108fc0a7d042e69a723dbe176 100644 (file)
@@ -1,8 +1,9 @@
 /*
+ * (C) Copyright 2008 Semihalf
+ *
  * (C) Copyright 2000-2004
  * DENX Software Engineering
  * Wolfgang Denk, wd@denx.de
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
 #include "mkimage.h"
 #include <image.h>
 
-extern int errno;
-
-#ifndef MAP_FAILED
-#define MAP_FAILED (-1)
-#endif
-
-char *cmdname;
-
-extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len);
-
-typedef struct table_entry {
-       int     val;            /* as defined in image.h        */
-       char    *sname;         /* short (input) name           */
-       char    *lname;         /* long (output) name           */
-} table_entry_t;
-
-table_entry_t arch_name[] = {
-    {  IH_ARCH_INVALID,        NULL,           "Invalid CPU",  },
-    {  IH_ARCH_ALPHA,          "alpha",        "Alpha",        },
-    {  IH_ARCH_ARM,            "arm",          "ARM",          },
-    {  IH_ARCH_I386,           "x86",          "Intel x86",    },
-    {  IH_ARCH_IA64,           "ia64",         "IA64",         },
-    {  IH_ARCH_M68K,           "m68k",         "MC68000",      },
-    {  IH_ARCH_MICROBLAZE,     "microblaze",   "MicroBlaze",   },
-    {  IH_ARCH_MIPS,           "mips",         "MIPS",         },
-    {  IH_ARCH_MIPS64,         "mips64",       "MIPS 64 Bit",  },
-    {  IH_ARCH_NIOS,           "nios",         "NIOS",         },
-    {  IH_ARCH_NIOS2,          "nios2",        "NIOS II",      },
-    {  IH_ARCH_PPC,            "ppc",          "PowerPC",      },
-    {  IH_ARCH_S390,           "s390",         "IBM S390",     },
-    {  IH_ARCH_SH,             "sh",           "SuperH",       },
-    {  IH_ARCH_SPARC,          "sparc",        "SPARC",        },
-    {  IH_ARCH_SPARC64,        "sparc64",      "SPARC 64 Bit", },
-    {  IH_ARCH_BLACKFIN,       "blackfin",     "Blackfin",     },
-    {  IH_ARCH_AVR32,          "avr32",        "AVR32",        },
-    {  -1,                     "",             "",             },
-};
-
-table_entry_t os_name[] = {
-    {  IH_OS_INVALID,  NULL,           "Invalid OS",           },
-    {  IH_OS_4_4BSD,   "4_4bsd",       "4_4BSD",               },
-    {  IH_OS_ARTOS,    "artos",        "ARTOS",                },
-    {  IH_OS_DELL,     "dell",         "Dell",                 },
-    {  IH_OS_ESIX,     "esix",         "Esix",                 },
-    {  IH_OS_FREEBSD,  "freebsd",      "FreeBSD",              },
-    {  IH_OS_IRIX,     "irix",         "Irix",                 },
-    {  IH_OS_LINUX,    "linux",        "Linux",                },
-    {  IH_OS_LYNXOS,   "lynxos",       "LynxOS",               },
-    {  IH_OS_NCR,      "ncr",          "NCR",                  },
-    {  IH_OS_NETBSD,   "netbsd",       "NetBSD",               },
-    {  IH_OS_OPENBSD,  "openbsd",      "OpenBSD",              },
-    {  IH_OS_PSOS,     "psos",         "pSOS",                 },
-    {  IH_OS_QNX,      "qnx",          "QNX",                  },
-    {  IH_OS_RTEMS,    "rtems",        "RTEMS",                },
-    {  IH_OS_SCO,      "sco",          "SCO",                  },
-    {  IH_OS_SOLARIS,  "solaris",      "Solaris",              },
-    {  IH_OS_SVR4,     "svr4",         "SVR4",                 },
-    {  IH_OS_U_BOOT,   "u-boot",       "U-Boot",               },
-    {  IH_OS_VXWORKS,  "vxworks",      "VxWorks",              },
-    {  -1,             "",             "",                     },
-};
-
-table_entry_t type_name[] = {
-    {  IH_TYPE_INVALID,    NULL,         "Invalid Image",      },
-    {  IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image",   },
-    {  IH_TYPE_FIRMWARE,   "firmware",   "Firmware",           },
-    {  IH_TYPE_KERNEL,     "kernel",     "Kernel Image",       },
-    {  IH_TYPE_MULTI,      "multi",      "Multi-File Image",   },
-    {  IH_TYPE_RAMDISK,    "ramdisk",    "RAMDisk Image",      },
-    {  IH_TYPE_SCRIPT,     "script",     "Script",             },
-    {  IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
-    {  IH_TYPE_FLATDT,     "flat_dt",    "Flat Device Tree",   },
-    {  -1,                 "",           "",                   },
-};
-
-table_entry_t comp_name[] = {
-    {  IH_COMP_NONE,   "none",         "uncompressed",         },
-    {  IH_COMP_BZIP2,  "bzip2",        "bzip2 compressed",     },
-    {  IH_COMP_GZIP,   "gzip",         "gzip compressed",      },
-    {  -1,             "",             "",                     },
-};
-
-static void    copy_file (int, const char *, int);
-static void    usage   (void);
-static void    print_header (image_header_t *);
-static void    print_type (image_header_t *);
-static char    *put_table_entry (table_entry_t *, char *, int);
-static char    *put_arch (int);
-static char    *put_type (int);
-static char    *put_os   (int);
-static char    *put_comp (int);
-static int     get_table_entry (table_entry_t *, char *, char *);
-static int     get_arch(char *);
-static int     get_comp(char *);
-static int     get_os  (char *);
-static int     get_type(char *);
-
+extern unsigned long   crc32 (unsigned long crc, const char *buf, unsigned int len);
+static void            copy_file (int, const char *, int);
+static void            usage (void);
+static void            image_verify_header (char *, int);
+static void            fit_handle_file (void);
 
 char   *datafile;
 char   *imagefile;
+char   *cmdname;
 
 int dflag    = 0;
 int eflag    = 0;
+int fflag    = 0;
 int lflag    = 0;
 int vflag    = 0;
 int xflag    = 0;
@@ -133,6 +44,7 @@ int opt_os   = IH_OS_LINUX;
 int opt_arch = IH_ARCH_PPC;
 int opt_type = IH_TYPE_KERNEL;
 int opt_comp = IH_COMP_GZIP;
+char *opt_dtc = MKIMAGE_DEFAULT_DTC_OPTIONS;
 
 image_header_t header;
 image_header_t *hdr = &header;
@@ -140,7 +52,7 @@ image_header_t *hdr = &header;
 int
 main (int argc, char **argv)
 {
-       int ifd;
+       int ifd = -1;
        uint32_t checksum;
        uint32_t addr;
        uint32_t ep;
@@ -160,22 +72,28 @@ main (int argc, char **argv)
                                break;
                        case 'A':
                                if ((--argc <= 0) ||
-                                   (opt_arch = get_arch(*++argv)) < 0)
+                                   (opt_arch = genimg_get_arch_id (*++argv)) < 0)
                                        usage ();
                                goto NXTARG;
                        case 'C':
                                if ((--argc <= 0) ||
-                                   (opt_comp = get_comp(*++argv)) < 0)
+                                   (opt_comp = genimg_get_comp_id (*++argv)) < 0)
                                        usage ();
                                goto NXTARG;
+                       case 'D':
+                               if (--argc <= 0)
+                                       usage ();
+                               opt_dtc = *++argv;
+                               goto NXTARG;
+
                        case 'O':
                                if ((--argc <= 0) ||
-                                   (opt_os = get_os(*++argv)) < 0)
+                                   (opt_os = genimg_get_os_id (*++argv)) < 0)
                                        usage ();
                                goto NXTARG;
                        case 'T':
                                if ((--argc <= 0) ||
-                                   (opt_type = get_type(*++argv)) < 0)
+                                   (opt_type = genimg_get_type_id (*++argv)) < 0)
                                        usage ();
                                goto NXTARG;
 
@@ -208,6 +126,12 @@ main (int argc, char **argv)
                                }
                                eflag = 1;
                                goto NXTARG;
+                       case 'f':
+                               if (--argc <= 0)
+                                       usage ();
+                               datafile = *++argv;
+                               fflag = 1;
+                               goto NXTARG;
                        case 'n':
                                if (--argc <= 0)
                                        usage ();
@@ -226,7 +150,10 @@ main (int argc, char **argv)
 NXTARG:                ;
        }
 
-       if ((argc != 1) || ((lflag ^ dflag) == 0))
+       if ((argc != 1) ||
+               (dflag && (fflag || lflag)) ||
+               (fflag && (dflag || lflag)) ||
+               (lflag && (dflag || fflag)))
                usage();
 
        if (!eflag) {
@@ -252,21 +179,22 @@ NXTARG:           ;
 
        imagefile = *argv;
 
-       if (lflag) {
-               ifd = open(imagefile, O_RDONLY|O_BINARY);
-       } else {
-               ifd = open(imagefile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0666);
-       }
+       if (!fflag){
+               if (lflag) {
+                       ifd = open (imagefile, O_RDONLY|O_BINARY);
+               } else {
+                       ifd = open (imagefile,
+                               O_RDWR|O_CREAT|O_TRUNC|O_BINARY, 0666);
+               }
 
-       if (ifd < 0) {
-               fprintf (stderr, "%s: Can't open %s: %s\n",
-                       cmdname, imagefile, strerror(errno));
-               exit (EXIT_FAILURE);
+               if (ifd < 0) {
+                       fprintf (stderr, "%s: Can't open %s: %s\n",
+                               cmdname, imagefile, strerror(errno));
+                       exit (EXIT_FAILURE);
+               }
        }
 
        if (lflag) {
-               int len;
-               char *data;
                /*
                 * list header information of existing image
                 */
@@ -283,51 +211,30 @@ NXTARG:           ;
                        exit (EXIT_FAILURE);
                }
 
-               ptr = (unsigned char *)mmap(0, sbuf.st_size,
-                                           PROT_READ, MAP_SHARED, ifd, 0);
-               if ((caddr_t)ptr == (caddr_t)-1) {
+               ptr = mmap(0, sbuf.st_size, PROT_READ, MAP_SHARED, ifd, 0);
+               if (ptr == MAP_FAILED) {
                        fprintf (stderr, "%s: Can't read %s: %s\n",
                                cmdname, imagefile, strerror(errno));
                        exit (EXIT_FAILURE);
                }
 
-               /*
-                * image_check_hcrc() creates copy of header so that
-                * we can blank out the checksum field for checking -
-                * this can't be done on the PROT_READ mapped data.
-                */
-               hdr = (image_header_t *)ptr;
-
-               if (!image_check_magic (hdr)) {
-                       fprintf (stderr,
-                               "%s: Bad Magic Number: \"%s\" is no valid image\n",
-                               cmdname, imagefile);
-                       exit (EXIT_FAILURE);
+               if (fdt_check_header (ptr)) {
+                       /* old-style image */
+                       image_verify_header ((char *)ptr, sbuf.st_size);
+                       image_print_contents ((image_header_t *)ptr);
+               } else {
+                       /* FIT image */
+                       fit_print_contents (ptr);
                }
 
-               if (!image_check_hcrc (hdr)) {
-                       fprintf (stderr,
-                               "%s: ERROR: \"%s\" has bad header checksum!\n",
-                               cmdname, imagefile);
-                       exit (EXIT_FAILURE);
-               }
-
-               data = (char *)image_get_data (hdr);
-               len  = sbuf.st_size - image_get_header_size ();
-
-               if (crc32(0, data, len) != image_get_dcrc (hdr)) {
-                       fprintf (stderr,
-                               "%s: ERROR: \"%s\" has corrupted data!\n",
-                               cmdname, imagefile);
-                       exit (EXIT_FAILURE);
-               }
-
-               /* for multi-file images we need the data part, too */
-               print_header ((image_header_t *)ptr);
-
                (void) munmap((void *)ptr, sbuf.st_size);
                (void) close (ifd);
 
+               exit (EXIT_SUCCESS);
+       } else if (fflag) {
+               /* Flattened Image Tree (FIT) format  handling */
+               debug ("FIT format handling\n");
+               fit_handle_file ();
                exit (EXIT_SUCCESS);
        }
 
@@ -361,7 +268,7 @@ NXTARG:             ;
                                                cmdname, file, strerror(errno));
                                        exit (EXIT_FAILURE);
                                }
-                               size = cpu_to_image (sbuf.st_size);
+                               size = cpu_to_uimage (sbuf.st_size);
                        } else {
                                size = 0;
                        }
@@ -415,9 +322,8 @@ NXTARG:             ;
                exit (EXIT_FAILURE);
        }
 
-       ptr = (unsigned char *)mmap(0, sbuf.st_size,
-                                   PROT_READ|PROT_WRITE, MAP_SHARED, ifd, 0);
-       if (ptr == (unsigned char *)MAP_FAILED) {
+       ptr = mmap(0, sbuf.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, ifd, 0);
+       if (ptr == MAP_FAILED) {
                fprintf (stderr, "%s: Can't map %s: %s\n",
                        cmdname, imagefile, strerror(errno));
                exit (EXIT_FAILURE);
@@ -448,7 +354,7 @@ NXTARG:             ;
 
        image_set_hcrc (hdr, checksum);
 
-       print_header (hdr);
+       image_print_contents (hdr);
 
        (void) munmap((void *)ptr, sbuf.st_size);
 
@@ -495,9 +401,8 @@ copy_file (int ifd, const char *datafile, int pad)
                exit (EXIT_FAILURE);
        }
 
-       ptr = (unsigned char *)mmap(0, sbuf.st_size,
-                                   PROT_READ, MAP_SHARED, dfd, 0);
-       if (ptr == (unsigned char *)MAP_FAILED) {
+       ptr = mmap(0, sbuf.st_size, PROT_READ, MAP_SHARED, dfd, 0);
+       if (ptr == MAP_FAILED) {
                fprintf (stderr, "%s: Can't read %s: %s\n",
                        cmdname, datafile, strerror(errno));
                exit (EXIT_FAILURE);
@@ -554,11 +459,11 @@ void
 usage ()
 {
        fprintf (stderr, "Usage: %s -l image\n"
-                        "          -l ==> list image header information\n"
-                        "       %s [-x] -A arch -O os -T type -C comp "
-                        "-a addr -e ep -n name -d data_file[:data_file...] image\n",
-               cmdname, cmdname);
-       fprintf (stderr, "          -A ==> set architecture to 'arch'\n"
+                        "          -l ==> list image header information\n",
+               cmdname);
+       fprintf (stderr, "       %s [-x] -A arch -O os -T type -C comp "
+                        "-a addr -e ep -n name -d data_file[:data_file...] image\n"
+                        "          -A ==> set architecture to 'arch'\n"
                         "          -O ==> set operating system to 'os'\n"
                         "          -T ==> set image type to 'type'\n"
                         "          -C ==> set compression type 'comp'\n"
@@ -566,144 +471,157 @@ usage ()
                         "          -e ==> set entry point to 'ep' (hex)\n"
                         "          -n ==> set image name to 'name'\n"
                         "          -d ==> use image data from 'datafile'\n"
-                        "          -x ==> set XIP (execute in place)\n"
-               );
+                        "          -x ==> set XIP (execute in place)\n",
+               cmdname);
+       fprintf (stderr, "       %s [-D dtc_options] -f fit-image.its fit-image\n",
+               cmdname);
+
        exit (EXIT_FAILURE);
 }
 
 static void
-print_header (image_header_t *hdr)
+image_verify_header (char *ptr, int image_size)
 {
-       time_t timestamp;
-       uint32_t size;
-
-       timestamp = (time_t)image_get_time (hdr);
-       size = image_get_data_size (hdr);
-
-       printf ("Image Name:   %.*s\n", IH_NMLEN, image_get_name (hdr));
-       printf ("Created:      %s", ctime(&timestamp));
-       printf ("Image Type:   "); print_type(hdr);
-       printf ("Data Size:    %d Bytes = %.2f kB = %.2f MB\n",
-               size, (double)size / 1.024e3, (double)size / 1.048576e6 );
-       printf ("Load Address: 0x%08X\n", image_get_load (hdr));
-       printf ("Entry Point:  0x%08X\n", image_get_ep (hdr));
-
-       if (image_check_type (hdr, IH_TYPE_MULTI) ||
-                       image_check_type (hdr, IH_TYPE_SCRIPT)) {
-               int i, ptrs;
-               uint32_t pos;
-               uint32_t *len_ptr = (uint32_t *) (
-                                       (unsigned long)hdr + image_get_header_size ()
-                               );
-
-               /* determine number of images first (to calculate image offsets) */
-               for (i=0; len_ptr[i]; ++i)      /* null pointer terminates list */
-                       ;
-               ptrs = i;               /* null pointer terminates list */
-
-               pos = image_get_header_size () + ptrs * sizeof(long);
-               printf ("Contents:\n");
-               for (i=0; len_ptr[i]; ++i) {
-                       size = image_to_cpu (len_ptr[i]);
-
-                       printf ("   Image %d: %8d Bytes = %4d kB = %d MB\n",
-                               i, size, size>>10, size>>20);
-                       if (image_check_type (hdr, IH_TYPE_SCRIPT) && i > 0) {
-                               /*
-                                * the user may need to know offsets
-                                * if planning to do something with
-                                * multiple files
-                                */
-                               printf ("    Offset = %08X\n", pos);
-                       }
-                       /* copy_file() will pad the first files to even word align */
-                       size += 3;
-                       size &= ~3;
-                       pos += size;
-               }
-       }
-}
+       int len;
+       char *data;
+       uint32_t checksum;
+       image_header_t header;
+       image_header_t *hdr = &header;
 
+       /*
+        * create copy of header so that we can blank out the
+        * checksum field for checking - this can't be done
+        * on the PROT_READ mapped data.
+        */
+       memcpy (hdr, ptr, sizeof(image_header_t));
 
-static void
-print_type (image_header_t *hdr)
-{
-       printf ("%s %s %s (%s)\n",
-               put_arch (image_get_arch (hdr)),
-               put_os   (image_get_os (hdr)),
-               put_type (image_get_type (hdr)),
-               put_comp (image_get_comp (hdr))
-       );
-}
+       if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) {
+               fprintf (stderr,
+                       "%s: Bad Magic Number: \"%s\" is no valid image\n",
+                       cmdname, imagefile);
+               exit (EXIT_FAILURE);
+       }
 
-static char *put_arch (int arch)
-{
-       return (put_table_entry(arch_name, "Unknown Architecture", arch));
-}
+       data = (char *)hdr;
+       len  = sizeof(image_header_t);
 
-static char *put_os (int os)
-{
-       return (put_table_entry(os_name, "Unknown OS", os));
-}
+       checksum = be32_to_cpu(hdr->ih_hcrc);
+       hdr->ih_hcrc = cpu_to_be32(0);  /* clear for re-calculation */
 
-static char *put_type (int type)
-{
-       return (put_table_entry(type_name, "Unknown Image", type));
-}
+       if (crc32 (0, data, len) != checksum) {
+               fprintf (stderr,
+                       "%s: ERROR: \"%s\" has bad header checksum!\n",
+                       cmdname, imagefile);
+               exit (EXIT_FAILURE);
+       }
 
-static char *put_comp (int comp)
-{
-       return (put_table_entry(comp_name, "Unknown Compression", comp));
-}
+       data = ptr + sizeof(image_header_t);
+       len  = image_size - sizeof(image_header_t) ;
 
-static char *put_table_entry (table_entry_t *table, char *msg, int type)
-{
-       for (; table->val>=0; ++table) {
-               if (table->val == type)
-                       return (table->lname);
+       if (crc32 (0, data, len) != be32_to_cpu(hdr->ih_dcrc)) {
+               fprintf (stderr,
+                       "%s: ERROR: \"%s\" has corrupted data!\n",
+                       cmdname, imagefile);
+               exit (EXIT_FAILURE);
        }
-       return (msg);
 }
 
-static int get_arch(char *name)
+/**
+ * fit_handle_file - main FIT file processing function
+ *
+ * fit_handle_file() runs dtc to convert .its to .itb, includes
+ * binary data, updates timestamp property and calculates hashes.
+ *
+ * datafile  - .its file
+ * imagefile - .itb file
+ *
+ * returns:
+ *     only on success, otherwise calls exit (EXIT_FAILURE);
+ */
+static void fit_handle_file (void)
 {
-       return (get_table_entry(arch_name, "CPU", name));
-}
+       char tmpfile[MKIMAGE_MAX_TMPFILE_LEN];
+       char cmd[MKIMAGE_MAX_DTC_CMDLINE_LEN];
+       int tfd;
+       struct stat sbuf;
+       unsigned char *ptr;
 
+       /* call dtc to include binary properties into the tmp file */
+       if (strlen (imagefile) + strlen (MKIMAGE_TMPFILE_SUFFIX) + 1 >
+               sizeof (tmpfile)) {
+               fprintf (stderr, "%s: Image file name (%s) too long, "
+                               "can't create tmpfile",
+                               imagefile, cmdname);
+               exit (EXIT_FAILURE);
+       }
+       sprintf (tmpfile, "%s%s", imagefile, MKIMAGE_TMPFILE_SUFFIX);
+
+       /* dtc -I dts -O -p 200 datafile > tmpfile */
+       sprintf (cmd, "%s %s %s > %s",
+                       MKIMAGE_DTC, opt_dtc, datafile, tmpfile);
+       debug ("Trying to execute \"%s\"\n", cmd);
+       if (system (cmd) == -1) {
+               fprintf (stderr, "%s: system(%s) failed: %s\n",
+                               cmdname, cmd, strerror(errno));
+               unlink (tmpfile);
+               exit (EXIT_FAILURE);
+       }
 
-static int get_comp(char *name)
-{
-       return (get_table_entry(comp_name, "Compression", name));
-}
+       /* load FIT blob into memory */
+       tfd = open (tmpfile, O_RDWR|O_BINARY);
 
+       if (tfd < 0) {
+               fprintf (stderr, "%s: Can't open %s: %s\n",
+                               cmdname, tmpfile, strerror(errno));
+               unlink (tmpfile);
+               exit (EXIT_FAILURE);
+       }
 
-static int get_os (char *name)
-{
-       return (get_table_entry(os_name, "OS", name));
-}
+       if (fstat (tfd, &sbuf) < 0) {
+               fprintf (stderr, "%s: Can't stat %s: %s\n",
+                               cmdname, tmpfile, strerror(errno));
+               unlink (tmpfile);
+               exit (EXIT_FAILURE);
+       }
 
+       ptr = mmap (0, sbuf.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, tfd, 0);
+       if (ptr == MAP_FAILED) {
+               fprintf (stderr, "%s: Can't read %s: %s\n",
+                               cmdname, tmpfile, strerror(errno));
+               unlink (tmpfile);
+               exit (EXIT_FAILURE);
+       }
 
-static int get_type(char *name)
-{
-       return (get_table_entry(type_name, "Image", name));
-}
+       /* check if ptr has a valid blob */
+       if (fdt_check_header (ptr)) {
+               fprintf (stderr, "%s: Invalid FIT blob\n", cmdname);
+               unlink (tmpfile);
+               exit (EXIT_FAILURE);
+       }
 
-static int get_table_entry (table_entry_t *table, char *msg, char *name)
-{
-       table_entry_t *t;
-       int first = 1;
+       /* set hashes for images in the blob */
+       if (fit_set_hashes (ptr)) {
+               fprintf (stderr, "%s Can't add hashes to FIT blob", cmdname);
+               unlink (tmpfile);
+               exit (EXIT_FAILURE);
+       }
 
-       for (t=table; t->val>=0; ++t) {
-               if (t->sname && strcasecmp(t->sname, name)==0)
-                       return (t->val);
+       /* add a timestamp at offset 0 i.e., root  */
+       if (fit_set_timestamp (ptr, 0, sbuf.st_mtime)) {
+               fprintf (stderr, "%s: Can't add image timestamp\n", cmdname);
+               unlink (tmpfile);
+               exit (EXIT_FAILURE);
        }
-       fprintf (stderr, "\nInvalid %s Type - valid names are", msg);
-       for (t=table; t->val>=0; ++t) {
-               if (t->sname == NULL)
-                       continue;
-               fprintf (stderr, "%c %s", (first) ? ':' : ',', t->sname);
-               first = 0;
+       debug ("Added timestamp successfully\n");
+
+       munmap ((void *)ptr, sbuf.st_size);
+       close (tfd);
+
+       if (rename (tmpfile, imagefile) == -1) {
+               fprintf (stderr, "%s: Can't rename %s to %s: %s\n",
+                               cmdname, tmpfile, imagefile, strerror (errno));
+               unlink (tmpfile);
+               unlink (imagefile);
+               exit (EXIT_FAILURE);
        }
-       fprintf (stderr, "\n");
-       return (-1);
 }