diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-24 22:31:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-24 22:31:32 -0700 |
commit | 9ce9dea4e1c2419cca126d29fa7730baa078a11b (patch) | |
tree | 6bec2aeb2df40cfe1435c476c9e48da58cebd875 /apply.c | |
parent | 7580f92ffa970b9484ac214f7b53cec5e26ca4bc (diff) | |
parent | 0d1bd1dfb37ef25e1911777c94129fc769ffec38 (diff) | |
download | git-9ce9dea4e1c2419cca126d29fa7730baa078a11b.tar.gz |
Sync with Git 2.40.1
Diffstat (limited to 'apply.c')
-rw-r--r-- | apply.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -4586,7 +4586,7 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch) FILE *rej; char namebuf[PATH_MAX]; struct fragment *frag; - int cnt = 0; + int fd, cnt = 0; struct strbuf sb = STRBUF_INIT; for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) { @@ -4626,7 +4626,17 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch) memcpy(namebuf, patch->new_name, cnt); memcpy(namebuf + cnt, ".rej", 5); - rej = fopen(namebuf, "w"); + fd = open(namebuf, O_CREAT | O_EXCL | O_WRONLY, 0666); + if (fd < 0) { + if (errno != EEXIST) + return error_errno(_("cannot open %s"), namebuf); + if (unlink(namebuf)) + return error_errno(_("cannot unlink '%s'"), namebuf); + fd = open(namebuf, O_CREAT | O_EXCL | O_WRONLY, 0666); + if (fd < 0) + return error_errno(_("cannot open %s"), namebuf); + } + rej = fdopen(fd, "w"); if (!rej) return error_errno(_("cannot open %s"), namebuf); |