From cda134ab1eac84f874aacf8e885a07112a7fd5ce Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 6 Nov 2014 21:19:20 +0100 Subject: copy: teach copy_bytes() sendfile() support, and then replace sendfile_full() by it --- src/systemctl/systemctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/systemctl') diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index d9e9c2a6c3..c903c54e9b 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -67,6 +67,7 @@ #include "logs-show.h" #include "socket-util.h" #include "fileio.h" +#include "copy.h" #include "env-util.h" #include "bus-util.h" #include "bus-message.h" @@ -4647,7 +4648,7 @@ static int cat(sd_bus *bus, char **args) { ansi_highlight_off()); fflush(stdout); - r = sendfile_full(STDOUT_FILENO, fragment_path); + r = copy_file_fd(fragment_path, STDOUT_FILENO); if (r < 0) { log_warning("Failed to cat %s: %s", fragment_path, strerror(-r)); continue; @@ -4662,7 +4663,7 @@ static int cat(sd_bus *bus, char **args) { ansi_highlight_off()); fflush(stdout); - r = sendfile_full(STDOUT_FILENO, *path); + r = copy_file_fd(*path, STDOUT_FILENO); if (r < 0) { log_warning("Failed to cat %s: %s", *path, strerror(-r)); continue; -- cgit v1.2.3-54-g00ecf