git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH 1/2] xopen: explicitly report creation failures
@ 2021-08-25 20:14 René Scharfe
  2021-08-25 20:16 ` [PATCH 2/2] use xopen() to handle fatal open(2) failures René Scharfe
  2021-08-25 23:46 ` [PATCH 1/2] xopen: explicitly report creation failures Carlo Arenas
  0 siblings, 2 replies; 5+ messages in thread
From: René Scharfe @ 2021-08-25 20:14 UTC (permalink / raw)
  To: Git List; +Cc: Junio C Hamano

If the flags O_CREAT and O_EXCL are both given then open(2) is supposed
to create the file and error out if it already exists.  The error
message in that case looks like this:

	fatal: could not open 'foo' for writing: File exists

Without further context this is confusing: Why should the existence of
the file pose a problem?  Isn't that a requirement for writing to it?

Add a more specific error message for that case to tell the user that we
actually don't expect the file to preexist, so the example becomes:

	fatal: unable to create 'foo': File exists

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 wrapper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wrapper.c b/wrapper.c
index 563ad590df..7c6586af32 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -193,7 +193,9 @@ int xopen(const char *path, int oflag, ...)
 		if (errno == EINTR)
 			continue;

-		if ((oflag & O_RDWR) == O_RDWR)
+		if ((oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
+			die_errno(_("unable to create '%s'"), path);
+		else if ((oflag & O_RDWR) == O_RDWR)
 			die_errno(_("could not open '%s' for reading and writing"), path);
 		else if ((oflag & O_WRONLY) == O_WRONLY)
 			die_errno(_("could not open '%s' for writing"), path);
--
2.33.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-08-26 16:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-25 20:14 [PATCH 1/2] xopen: explicitly report creation failures René Scharfe
2021-08-25 20:16 ` [PATCH 2/2] use xopen() to handle fatal open(2) failures René Scharfe
2021-08-25 23:46 ` [PATCH 1/2] xopen: explicitly report creation failures Carlo Arenas
2021-08-26 15:23   ` René Scharfe
2021-08-26 16:49     ` Junio C Hamano

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).