diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 12:16:25 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 12:16:25 +0000 |
| commit | 1b5312d5c01fd5e12b938cfe65cda562e822619d (patch) | |
| tree | 60f086613e97aae5cb2635b8b9e3251c7b3c55cf /src/skaembutils/s6-head.c | |
| parent | ac77200b30d6c8bbe9093655dd0f8d8bf6e88feb (diff) | |
| download | s6-portable-utils-1b5312d5c01fd5e12b938cfe65cda562e822619d.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/skaembutils/s6-head.c')
| -rw-r--r-- | src/skaembutils/s6-head.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/skaembutils/s6-head.c b/src/skaembutils/s6-head.c index 589ff45..196f2c8 100644 --- a/src/skaembutils/s6-head.c +++ b/src/skaembutils/s6-head.c @@ -1,11 +1,12 @@ /* ISC license. */ #include <sys/types.h> +#include <sys/uio.h> #include <errno.h> #include <skalibs/allreadwrite.h> #include <skalibs/sgetopt.h> #include <skalibs/bytestr.h> -#include <skalibs/uint.h> +#include <skalibs/types.h> #include <skalibs/buffer.h> #include <skalibs/siovec.h> #include <skalibs/strerr2.h> @@ -22,7 +23,7 @@ static int dolines (int fd, size_t lines) char buf[BUFFER_INSIZE] ; buffer in = BUFFER_INIT(&buffer_read, fd, buf, BUFFER_INSIZE) ; buffer out = BUFFER_INIT(&buffer_write, 1, buf, BUFFER_INSIZE) ; - siovec_t v[2] ; + struct iovec v[2] ; while (lines) { size_t w = 0 ; @@ -62,7 +63,7 @@ static int safedolines (int fd, size_t lines) size_t r = allread(fd, tmp, lines) ; if ((r < lines) && (errno != EPIPE)) return 0 ; lines -= byte_count(tmp, r, '\n') ; - if (buffer_put(buffer_1, tmp, r) < (int)r) return 0 ; + if (buffer_put(buffer_1, tmp, r) < (ssize_t)r) return 0 ; } if (!buffer_flush(buffer_1)) return 0 ; return 1 ; @@ -84,7 +85,7 @@ int main (int argc, char const *const *argv) int done = 0 ; for (;;) { - register int opt = subgetopt_r(argc, argv, "S123456789n:c:", &l) ; + int opt = subgetopt_r(argc, argv, "S123456789n:c:", &l) ; if (opt == -1) break ; switch (opt) { |