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

login: use ul_copy_file

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

diff --git a/login-utils/login.c b/login-utils/login.c
index 37a52f6612..b28bed2270 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -61,7 +61,6 @@
 #elif defined(HAVE_SECURITY_OPENPAM_H)
 # include <security/openpam.h>
 #endif
-#include <sys/sendfile.h>
 
 #ifdef HAVE_LIBAUDIT
 # include <libaudit.h>
@@ -345,9 +344,7 @@ static int motddir(const char *dirname)
 
 		fd = openat(dd, d->d_name, O_RDONLY|O_CLOEXEC);
 		if (fd >= 0) {
-			struct stat st;
-			if (fstat(fd, &st) == 0 && st.st_size > 0)
-				sendfile(fileno(stdout), fd, NULL, st.st_size);
+			ul_copy_file(fd, fileno(stdout));
 			close(fd);
 			done++;
 		}
@@ -396,7 +393,7 @@ static void motd(void)
 		if (S_ISREG(st.st_mode) && st.st_size > 0) {
 			int fd = open(file, O_RDONLY, 0);
 			if (fd >= 0) {
-				sendfile(fileno(stdout), fd, NULL, st.st_size);
+				ul_copy_file(fd, fileno(stdout));
 				close(fd);
 			}
 			done++;