From 9203b41a4fb9ead5bb162026153c65fd73880a04 Mon Sep 17 00:00:00 2001 From: Egor Chelak Date: Fri, 6 Nov 2020 12:43:18 +0200 Subject: [PATCH] nologin: use ul_copy_file Suggested-by: Sami Kerola Reviewed-by: Sami Kerola Signed-off-by: Egor Chelak --- login-utils/Makemodule.am | 1 + login-utils/nologin.c | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index 939cc7708d..4f52cea3c3 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -76,6 +76,7 @@ if BUILD_NOLOGIN sbin_PROGRAMS += nologin dist_man_MANS += login-utils/nologin.8 nologin_SOURCES = login-utils/nologin.c +nologin_LDADD = $(LDADD) libcommon.la endif diff --git a/login-utils/nologin.c b/login-utils/nologin.c index f38a3aab02..ecbd0d2fec 100644 --- a/login-utils/nologin.c +++ b/login-utils/nologin.c @@ -14,6 +14,7 @@ #include "c.h" #include "nls.h" #include "pathnames.h" +#include "fileutils.h" /* * Always return EXIT_FAILURE (1), don't try to be smart! @@ -97,12 +98,7 @@ int main(int argc, char *argv[]) if (c < 0 || !S_ISREG(st.st_mode)) goto dflt; else { - char buf[BUFSIZ]; - ssize_t rd; - - while ((rd = read(fd, buf, sizeof(buf))) > 0) - ignore_result( write(STDOUT_FILENO, buf, rd) ); - + ul_copy_file(fd, STDOUT_FILENO); close(fd); return EXIT_FAILURE; } -- 2.47.3