firmware-utils/mkzynfw: don't use next_offset twice (closes #7273)

[openwrt.git] / tools / firmware-utils / src / motorola-bin.c

diff --git a/tools/firmware-utils/src/motorola-bin.c b/tools/firmware-utils/src/motorola-bin.c
index 680249c..fecb4ce 100644 (file)
--- a/tools/firmware-utils/src/motorola-bin.c
+++ b/tools/firmware-utils/src/motorola-bin.c
@@ -6,7 +6,6 @@
  *                         D. Hugh Redelmeier
  *                         OpenWrt.org
  *
  *                         D. Hugh Redelmeier
  *                         OpenWrt.org
  *

- * $Id$

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License


@@ -170,7 +169,7 @@ int main(int argc, char **argv)
                        exit(3);
                } else {
                        // all is well, write the file without the prefix
                        exit(3);
                } else {
                        // all is well, write the file without the prefix

-                       if ((fd = open(argv[3], O_CREAT|O_WRONLY,0644)) < 0
+                       if ((fd = open(argv[3], O_CREAT|O_WRONLY|O_TRUNC,0644)) < 0

                        || write(fd, trx + sizeof(struct motorola), len - sizeof(struct motorola)) !=  len - sizeof(struct motorola)
                        || close(fd) < 0)
                        {
                        || write(fd, trx + sizeof(struct motorola), len - sizeof(struct motorola)) !=  len - sizeof(struct motorola)
                        || close(fd) < 0)
                        {


@@ -211,7 +210,7 @@ int main(int argc, char **argv)
                firmware->crc = htonl(crc32buf((unsigned char *)&firmware->flags, sizeof(firmware->flags) + len));
 
                // write the firmware
                firmware->crc = htonl(crc32buf((unsigned char *)&firmware->flags, sizeof(firmware->flags) + len));
 
                // write the firmware

-               if ((fd = open(argv[3], O_CREAT|O_WRONLY,0644)) < 0
+               if ((fd = open(argv[3], O_CREAT|O_WRONLY|O_TRUNC,0644)) < 0

                || write(fd, firmware, sizeof(struct motorola) + len) != sizeof(struct motorola) + len
                || close(fd) < 0)
                {
                || write(fd, firmware, sizeof(struct motorola) + len) != sizeof(struct motorola) + len
                || close(fd) < 0)
                {