mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Teresa Remmet <t.remmet@phytec.de>
To: barebox@lists.infradead.org
Subject: [PATCH] lib: libfile: Fix copying files to a non existing destination
Date: Fri, 13 Jan 2017 10:15:59 +0100	[thread overview]
Message-ID: <1484298959-25635-1-git-send-email-t.remmet@phytec.de> (raw)

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 <t.remmet@phytec.de>
---
 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
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2017-01-13  9:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-13  9:15 Teresa Remmet [this message]
2017-01-16  7:32 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1484298959-25635-1-git-send-email-t.remmet@phytec.de \
    --to=t.remmet@phytec.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox