summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeresa Remmet <t.remmet@phytec.de>2016-11-25 09:06:02 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-01-11 08:06:48 +0100
commit0ec6bd3e1be84da991091fab5bbe20f168471a39 (patch)
treecadd61f5ba58b53e472b8ab9a11c11a7b799bc5f
parentc580e8422c0cb6dfe963c826a9d83214e6f0aa8a (diff)
downloadbarebox-0ec6bd3e1be84da991091fab5bbe20f168471a39.tar.gz
barebox-0ec6bd3e1be84da991091fab5bbe20f168471a39.tar.xz
libfile: copy_file: Only open regular files with O_TRUNC
Device files can not truncate in the most cases. Check if the destination is a regular file and open only those with O_TRUNC. Signed-off-by: Teresa Remmet <t.remmet@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--lib/libfile.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/lib/libfile.c b/lib/libfile.c
index cba2f02a23..049ec32d77 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -263,9 +263,10 @@ int copy_file(const char *src, const char *dst, int verbose)
int srcfd = 0, dstfd = 0;
int r, w;
int ret = 1, err1 = 0;
+ int mode;
void *buf;
int total = 0;
- struct stat statbuf;
+ struct stat srcstat, dststat;
rw_buf = xmalloc(RW_BUF_SIZE);
@@ -275,17 +276,26 @@ int copy_file(const char *src, const char *dst, int verbose)
goto out;
}
- dstfd = open(dst, O_WRONLY | O_CREAT | O_TRUNC);
+ ret = stat(dst, &dststat);
+ if (ret)
+ goto out;
+
+ mode = O_WRONLY | O_CREAT;
+
+ if (S_ISREG(dststat.st_mode))
+ mode |= O_TRUNC;
+
+ dstfd = open(dst, mode);
if (dstfd < 0) {
printf("could not open %s: %s\n", dst, errno_str());
goto out;
}
if (verbose) {
- if (stat(src, &statbuf) < 0)
- statbuf.st_size = 0;
+ if (stat(src, &srcstat) < 0)
+ srcstat.st_size = 0;
- init_progression_bar(statbuf.st_size);
+ init_progression_bar(srcstat.st_size);
}
while (1) {
@@ -310,7 +320,7 @@ int copy_file(const char *src, const char *dst, int verbose)
}
if (verbose) {
- if (statbuf.st_size && statbuf.st_size != FILESIZE_MAX)
+ if (srcstat.st_size && srcstat.st_size != FILESIZE_MAX)
show_progress(total);
else
show_progress(total / 16384);