summaryrefslogtreecommitdiff
path: root/wrapper.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2021-08-25 20:14:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-08-25 21:39:06 (GMT)
commita7439d0f9dd291e7cc9e6c2dda19cbfdf09b62ee (patch)
tree2f2d828781a62834225905d4a55cefd28902f33f /wrapper.c
parent225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff)
downloadgit-a7439d0f9dd291e7cc9e6c2dda19cbfdf09b62ee.zip
git-a7439d0f9dd291e7cc9e6c2dda19cbfdf09b62ee.tar.gz
git-a7439d0f9dd291e7cc9e6c2dda19cbfdf09b62ee.tar.bz2
xopen: explicitly report creation failures
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wrapper.c')
-rw-r--r--wrapper.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/wrapper.c b/wrapper.c
index 563ad59..7c6586a 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);