diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:29 +0900 |
| commit | b77b96e29b9429a6cf10dd6fad15f9a220977029 (patch) | |
| tree | e894cf97fcbdcc2adf9373ea744e1d746d5a1cb3 /wrapper.c | |
| parent | 6baa11dc2a5bb926e88ee9befe88ecf3318ed83c (diff) | |
| parent | 0a288d1ee9a259d9faf238c5e4f5aedf5090d599 (diff) | |
| download | git-b77b96e29b9429a6cf10dd6fad15f9a220977029.tar.gz git-b77b96e29b9429a6cf10dd6fad15f9a220977029.tar.xz | |
Merge branch 'sr/wrapper-quote-filenames' into maint
Some error messages did not quote filenames shown in it, which have
been fixed.
* sr/wrapper-quote-filenames:
wrapper.c: consistently quote filenames in error messages
Diffstat (limited to 'wrapper.c')
| -rw-r--r-- | wrapper.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -569,7 +569,7 @@ static int warn_if_unremovable(const char *op, const char *file, int rc) if (!rc || errno == ENOENT) return 0; err = errno; - warning_errno("unable to %s %s", op, file); + warning_errno("unable to %s '%s'", op, file); errno = err; return rc; } @@ -583,7 +583,7 @@ int unlink_or_msg(const char *file, struct strbuf *err) if (!rc || errno == ENOENT) return 0; - strbuf_addf(err, "unable to unlink %s: %s", + strbuf_addf(err, "unable to unlink '%s': %s", file, strerror(errno)); return -1; } @@ -653,9 +653,9 @@ void write_file_buf(const char *path, const char *buf, size_t len) { int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC, 0666); if (write_in_full(fd, buf, len) < 0) - die_errno(_("could not write to %s"), path); + die_errno(_("could not write to '%s'"), path); if (close(fd)) - die_errno(_("could not close %s"), path); + die_errno(_("could not close '%s'"), path); } void write_file(const char *path, const char *fmt, ...) |