From 03116e4e6ae398ef0835ce83d04cbff8a27aa3aa Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 28 Apr 2019 18:52:17 +0000 Subject: Fix pipe reading in shutdown --- src/shutdown/s6-linux-init-shutdownd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c index c01727d..2cb9215 100644 --- a/src/shutdown/s6-linux-init-shutdownd.c +++ b/src/shutdown/s6-linux-init-shutdownd.c @@ -71,11 +71,11 @@ static inline void run_stage3 (char const *basedir, char const *const *envp) else strerr_warnwu2sys("spawn ", stage3) ; } -static inline void prepare_shutdown (char c, unsigned int *what, tain_t *deadline, unsigned int *grace_time) +static inline void prepare_shutdown (buffer *b, char c, unsigned int *what, tain_t *deadline, unsigned int *grace_time) { uint32_t u ; char pack[TAIN_PACK] ; - ssize_t r = sanitize_read(buffer_get(buffer_0small, pack, TAIN_PACK)) ; + ssize_t r = sanitize_read(buffer_get(b, pack, TAIN_PACK)) ; if (r == -1) strerr_diefu1sys(111, "read from pipe") ; if (r < TAIN_PACK + 4) strerr_dief1x(101, "bad shutdown protocol") ; *what = byte_chr("Shpr", c, 4) ; @@ -98,7 +98,7 @@ static inline void handle_fifo (buffer *b, unsigned int *what, tain_t *deadline, case 'h' : case 'p' : case 'r' : - prepare_shutdown(c, what, deadline, grace_time) ; + prepare_shutdown(b, c, what, deadline, grace_time) ; break ; case 'c' : *what = 0 ; -- cgit v1.2.3