[PATCH] readline/histfile.c: Check and retry write() operation in history_truncate_file()

Chen Gang
2014-06-11T02:36:02Z

For regular file, write() operation may also fail, so check it too. If
write() return 0, can simply wait and try again, it should not suspend
infinitely if environments have no critical issues.

The related warning (cross compile for aarch64-linux):

../../binutils-gdb/readline/histfile.c: In function Â‘history_truncate_fileÂ’:
../../binutils-gdb/readline/histfile.c:406:13: warning: ignoring return value of Â‘writeÂ’, declared with attribute warn_unused_result [-Wunused

readline/
* readline/histfile.c (history_truncate_file):
Check and retry write() operation.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
readline/ChangeLog.gdb | 5 +++++
readline/histfile.c | 25 +++++++++++++++++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 1218fd7..f547a90 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,8 @@
+2014-06-11 Chen Gang <gang.chen.5i5j@gmail.com>
+
+ * readline/histfile.c (history_truncate_file):
+ Check and retry write() operation.
+
2013-09-24 Pierre Muller <muller@sourceware.org>

* readline.c (bind_arrow_keys_internal):
diff --git a/readline/histfile.c b/readline/histfile.c
index 30a6182..66597a7 100644
--- a/readline/histfile.c
+++ b/readline/histfile.c
@@ -403,11 +403,32 @@ history_truncate_file (fname, lines)
truncate to. */
if (bp > buffer && ((file = open (filename, O_WRONLY|O_TRUNC|O_BINARY, 0600)) != -1))
{
- write (file, bp, chars_read - (bp - buffer));
+ int chars_write;
+#if defined (__BEOS__)
+ char *orig = bp;
+#endif
+
+ do
+ {
+ chars_write = write (file, bp, chars_read - (bp - buffer));
+ if (chars_write < 0)
+ {
+ rv = errno;
+ close (file);
+ goto truncate_exit;
+ }
+ else if (chars_write == 0)
+ {
+ usleep (1000);
+ continue;
+ }
+ bp += chars_write;
+ }
+ while (chars_read - (bp - buffer) > 0);

#if defined (__BEOS__)
/* BeOS ignores O_TRUNC. */
- ftruncate (file, chars_read - (bp - buffer));
+ ftruncate (file, chars_read - (orig - buffer));
#endif

close (file);
--
1.9.2.459.g68773ac