From: Egor Chelak <egor.chelak@gmail.com>
Date: Fri, 6 Nov 2020 10:43:18 +0000 (+0200)
Subject: nologin: use ul_copy_file
X-Git-Tag: v2.37-rc1~393^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9203b41a4fb9ead5bb162026153c65fd73880a04;p=thirdparty%2Futil-linux.git

nologin: use ul_copy_file

Suggested-by: Sami Kerola <kerolasa@iki.fi>
Reviewed-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Egor Chelak <egor.chelak@gmail.com>
---

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;
 	}