firmware-utils: when using open with O_CREAT and O_WRONLY, also use O_TRUNC to ensure...
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 23 Sep 2008 16:12:40 +0000 (16:12 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 23 Sep 2008 16:12:40 +0000 (16:12 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12667 3c298f89-4303-0410-b956-a3cf2f4a3e73

tools/firmware-utils/src/add_header.c
tools/firmware-utils/src/motorola-bin.c
tools/firmware-utils/src/ptgen.c

index 946068c..37775c3 100644 (file)
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
        memcpy(buf, &header, sizeof(header));
 
        // write the buf
-       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, buf, buflen) != buflen
        || close(fd) < 0)
        {
index 680249c..58563ad 100644 (file)
@@ -170,7 +170,7 @@ int main(int argc, char **argv)
                        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)
                        {
@@ -211,7 +211,7 @@ int main(int argc, char **argv)
                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)
                {
index 8733e25..d94aabb 100644 (file)
@@ -143,7 +143,7 @@ static int gen_ptable(int nr)
                printf("%ld\n", ((long) len * 512));
        }
 
-       if ((fd = open(filename, O_WRONLY|O_CREAT, 0644)) < 0) {
+       if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0) {
                fprintf(stderr, "Can't open output file '%s'\n",filename);
                return -1;
        }