ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Egor Chelak 2020-11-06 12:37:24 +02:00
parent 360cdaa6c7
commit 8fcdbefb7b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
login-utils/login.c
View File

@ -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++;