From: "René Scharfe" <l.s.r@web.de>
To: Simon Ruderich <simon@ruderich.org>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Ralf Thielow <ralf.thielow@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 2/2] sequencer.c: check return value of close() in rewrite_file()
Date: Wed, 1 Nov 2017 18:09:49 +0100 [thread overview]
Message-ID: <44fa927f-d4bc-9396-0a50-bc2366d4fadc@web.de> (raw)
In-Reply-To: <06c33d3cfa35c0524ede2970ee3169d6c62eb5c1.1509547231.git.simon@ruderich.org>
Am 01.11.2017 um 15:45 schrieb Simon Ruderich:
> Not checking close(2) can hide errors as not all errors are reported
> during the write(2).
>
> Signed-off-by: Simon Ruderich <simon@ruderich.org>
> ---
>
> On Wed, Nov 01, 2017 at 02:00:11PM +0100, René Scharfe wrote:
>> Most calls are not checked, but that doesn't necessarily mean they need
>> to (or should) stay that way. The Linux man-page of close(2) spends
>> multiple paragraphs recommending to check its return value.. Care to
>> send a follow-up patch?
>
> Hello,
>
> Sure, here is it.
>
> Regards
> Simon
>
> sequencer.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index f93b60f61..e0cc2f777 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -2673,7 +2673,8 @@ static int rewrite_file(const char *path, const char *buf, size_t len)
> return error_errno(_("could not open '%s' for writing"), path);
> if (write_in_full(fd, buf, len) < 0)
> rc = error_errno(_("could not write to '%s'"), path);
> - close(fd);
> + if (close(fd) && !rc)
> + rc = error_errno(_("could not close '%s'"), path);
> return rc;
> }
>
>
Looks good to me, thank you!
René
next prev parent reply other threads:[~2017-11-01 17:10 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 9:54 [PATCH 1/2] sequencer: factor out rewrite_file() René Scharfe
2017-10-31 9:58 ` [PATCH 2/2] sequencer: use O_TRUNC to truncate files René Scharfe
2017-10-31 16:34 ` Kevin Daudt
2017-11-01 15:34 ` Johannes Schindelin
2017-10-31 16:33 ` [PATCH 1/2] sequencer: factor out rewrite_file() Kevin Daudt
2017-11-01 6:06 ` Kevin Daudt
2017-11-01 11:10 ` Simon Ruderich
2017-11-01 13:00 ` René Scharfe
2017-11-01 14:44 ` [PATCH 1/2] wrapper.c: consistently quote filenames in error messages Simon Ruderich
2017-11-02 4:40 ` Junio C Hamano
2017-11-02 5:16 ` Junio C Hamano
2017-11-02 10:20 ` Simon Ruderich
2017-11-03 1:47 ` Junio C Hamano
2017-11-01 14:45 ` [PATCH 2/2] sequencer.c: check return value of close() in rewrite_file() Simon Ruderich
2017-11-01 17:09 ` René Scharfe [this message]
2017-11-01 15:33 ` [PATCH 1/2] sequencer: factor out rewrite_file() Johannes Schindelin
2017-11-01 19:47 ` Jeff King
2017-11-01 21:46 ` Johannes Schindelin
2017-11-01 22:16 ` Jeff King
2017-11-03 10:32 ` Simon Ruderich
2017-11-03 13:44 ` Junio C Hamano
2017-11-03 19:13 ` Jeff King
2017-11-04 9:05 ` René Scharfe
2017-11-04 9:35 ` Jeff King
2017-11-04 18:36 ` Simon Ruderich
2017-11-05 2:07 ` Jeff King
2017-11-06 16:13 ` Improved error handling (Was: [PATCH 1/2] sequencer: factor out rewrite_file()) Simon Ruderich
2017-11-16 10:36 ` Simon Ruderich
2017-11-17 22:33 ` Jeff King
2017-11-18 9:01 ` Johannes Sixt
2017-12-24 14:54 ` Jeff King
2017-12-24 15:45 ` Randall S. Becker
2017-12-25 10:28 ` Johannes Sixt
2017-11-03 14:46 ` [PATCH 1/2] sequencer: factor out rewrite_file() Johannes Schindelin
2017-11-03 18:57 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44fa927f-d4bc-9396-0a50-bc2366d4fadc@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=ralf.thielow@gmail.com \
--cc=simon@ruderich.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.
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).