If the destination file does not exist the stat call to check the file
type fails. Extend the check of the stat return value.
To allow to copy files to a new destination.
Fixes commit 0ec6bd3e1be8 ("libfile: copy_file: Only open
regular files with O_TRUNC")
Signed-off-by: Teresa Remmet <[email protected]>
---
lib/libfile.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/libfile.c b/lib/libfile.c
index 049ec32..3742314 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -276,14 +276,14 @@ int copy_file(const char *src, const char *dst, int
verbose)
goto out;
}
- ret = stat(dst, &dststat);
- if (ret)
- goto out;
-
mode = O_WRONLY | O_CREAT;
- if (S_ISREG(dststat.st_mode))
+ ret = stat(dst, &dststat);
+ /* Set O_TRUNC only if file does not exist or is a regular file */
+ if (ret == -ENOENT || (!ret && S_ISREG(dststat.st_mode)))
mode |= O_TRUNC;
+ else if (ret)
+ goto out;
dstfd = open(dst, mode);
if (dstfd < 0) {
--
1.9.1
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
