From: larsxschneider@gmail.com Date: Wed, 10 Aug 2016 13:04:02 GMT Subject: [PATCH v5 06/15] pkt-line: add packet_flush_gently() Message-ID: <20160810130411.12419-7-larsxschneider@gmail.com> In-Reply-To: <20160810130411.12419-1-larsxschneider@gmail.com> From: Lars Schneider packet_flush() would die in case of a write error even though for some callers an error would be acceptable. Add packet_flush_gently() which writes a pkt-line flush packet and returns `0` for success and `-1` for failure. Signed-off-by: Lars Schneider --- pkt-line.c | 6 ++++++ pkt-line.h | 1 + 2 files changed, 7 insertions(+) diff --git a/pkt-line.c b/pkt-line.c index a8207dd..e6a0924 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -92,6 +92,12 @@ void packet_flush(int fd) write_or_die(fd, "0000", 4); } +int packet_flush_gently(int fd) +{ + packet_trace("0000", 4, 1); + return (write_in_full(fd, "0000", 4) == 4 ? 0 : -1); +} + void packet_buf_flush(struct strbuf *buf) { packet_trace("0000", 4, 1); diff --git a/pkt-line.h b/pkt-line.h index 82676f4..b6c8bcd 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -23,6 +23,7 @@ void packet_flush(int fd); void packet_write(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); void packet_buf_flush(struct strbuf *buf); void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3))); +int packet_flush_gently(int fd); int packet_write_gently_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); /* -- 2.9.2