From: Alexander Turenko <alexander.turenko@tarantool.org>
To: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH 14/14] popen: fix popen_write_timeout retval type
Date: Wed, 15 Apr 2020 07:52:55 +0300 [thread overview]
Message-ID: <1a4540cd925a1cefb41013d15f90b3883ff3e302.1586926230.git.alexander.turenko@tarantool.org> (raw)
In-Reply-To: <cover.1586862436.git.alexander.turenko@tarantool.org>
On Linux x86_64 `ssize_t` is 64 bit, while `int` is 32 bit wide (at
least typically). Let's return `ssize_t` from popen_write_timeout() to
prevent data loss.
Part of #4031
Reported-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
src/lib/core/popen.c | 6 +++---
src/lib/core/popen.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/core/popen.c b/src/lib/core/popen.c
index cbf2fd690..bb55a80e7 100644
--- a/src/lib/core/popen.c
+++ b/src/lib/core/popen.c
@@ -370,7 +370,7 @@ stdX_str(unsigned int index)
* FIXME: Provide an info re amount written bytes in the case.
* Say, return -(written) in the case.
*/
-int
+ssize_t
popen_write_timeout(struct popen_handle *handle, const void *buf,
size_t count, unsigned int flags,
ev_tstamp timeout)
@@ -397,8 +397,8 @@ popen_write_timeout(struct popen_handle *handle, const void *buf,
handle->pid, stdX_str(idx), idx, buf, count,
handle->ios[idx].fd, timeout);
- int rc = coio_write_timeout_noxc(&handle->ios[idx], buf, count,
- timeout);
+ ssize_t rc = coio_write_timeout_noxc(&handle->ios[idx], buf,
+ count, timeout);
assert(rc < 0 || rc == (ssize_t)count);
return rc;
}
diff --git a/src/lib/core/popen.h b/src/lib/core/popen.h
index cffb53933..4f4a6d99d 100644
--- a/src/lib/core/popen.h
+++ b/src/lib/core/popen.h
@@ -167,7 +167,7 @@ popen_stat(struct popen_handle *handle, struct popen_stat *st);
extern const char *
popen_command(struct popen_handle *handle);
-extern int
+extern ssize_t
popen_write_timeout(struct popen_handle *handle, const void *buf,
size_t count, unsigned int flags,
ev_tstamp timeout);
--
2.25.0
next prev parent reply other threads:[~2020-04-15 4:53 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 11:38 [Tarantool-patches] [PATCH 00/12] Popen Lua API: preliminary patches 2 Alexander Turenko
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 01/12] popen: allow to kill process group Alexander Turenko
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 02/12] popen: add ability to keep child on deletion Alexander Turenko
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 03/12] popen: log a reason of close inherited fds failure Alexander Turenko
2020-04-14 11:52 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 04/12] popen: add missed diag_set() in popen_new() Alexander Turenko
2020-04-14 11:54 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 05/12] popen: remove retval from popen_stat() Alexander Turenko
2020-04-14 11:54 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 06/12] popen: quote multiword command arguments Alexander Turenko
2020-04-14 11:58 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 07/12] popen: add logging of duplicated logger fd Alexander Turenko
2020-04-14 11:58 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 08/12] popen: fix close-on-exec flag setting Alexander Turenko
2020-04-14 12:03 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 09/12] popen: clarify popen_{signal, delete} contract Alexander Turenko
2020-04-14 12:29 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 10/12] popen: add FIXME re group signal flaw Alexander Turenko
2020-04-14 13:19 ` Cyrill Gorcunov
2020-04-15 4:21 ` Alexander Turenko
2020-04-15 7:27 ` Cyrill Gorcunov
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 11/12] popen: clarify popen_read_timeout error message Alexander Turenko
2020-04-14 12:32 ` Cyrill Gorcunov
2020-04-15 4:21 ` Alexander Turenko
2020-04-15 7:39 ` Cyrill Gorcunov
2020-04-15 21:45 ` Alexander Turenko
2020-04-14 11:38 ` [Tarantool-patches] [PATCH 12/12] popen: allow to close parent's end of std* fds Alexander Turenko
2020-04-14 13:05 ` Cyrill Gorcunov
2020-04-15 4:21 ` Alexander Turenko
2020-04-15 7:43 ` Cyrill Gorcunov
2020-04-15 21:45 ` Alexander Turenko
2020-04-15 4:25 ` [Tarantool-patches] [PATCH 13/13] popen: add caution comment for popen_may_io() Alexander Turenko
2020-04-15 7:44 ` Cyrill Gorcunov
2020-04-15 4:52 ` Alexander Turenko [this message]
2020-04-15 23:57 ` [Tarantool-patches] [PATCH 00/12] Popen Lua API: preliminary patches 2 Alexander Turenko
2020-04-16 0:00 ` Alexander Turenko
2020-04-16 11:52 ` Cyrill Gorcunov
2020-04-17 6:58 ` Kirill Yukhin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1a4540cd925a1cefb41013d15f90b3883ff3e302.1586926230.git.alexander.turenko@tarantool.org \
--to=alexander.turenko@tarantool.org \
--cc=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 14/14] popen: fix popen_write_timeout retval type' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox