From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 31 Aug 2015 08:23:46 +0000 (+0800)
Subject: login: replace siginterrupt with sigaction
X-Git-Tag: v2.27~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b76608ef83d79ccba4b8f4f5eb2a50cf48b9519;p=thirdparty%2Futil-linux.git

login: replace siginterrupt with sigaction

[kzak@redhat.com: - POSIX.1-2008 marks siginterrupt() as obsolete]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---

diff --git a/login-utils/login.c b/login-utils/login.c
index 8d4b01b10e..0e45de7ac3 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -1127,6 +1127,7 @@ int main(int argc, char **argv)
 	char *buff;
 	int childArgc = 0;
 	int retcode;
+	struct sigaction act;
 
 	char *pwdbuf = NULL;
 	struct passwd *pwd = NULL, _pwd;
@@ -1145,7 +1146,9 @@ int main(int argc, char **argv)
 	timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
 
 	signal(SIGALRM, timedout);
-	siginterrupt(SIGALRM, 1);	/* we have to interrupt syscalls like ioctl() */
+	(void) sigaction(SIGALRM, NULL, &act);
+	act.sa_flags &= ~SA_RESTART;
+	sigaction(SIGALRM, &act, NULL);
 	alarm(timeout);
 	signal(SIGQUIT, SIG_IGN);
 	signal(SIGINT, SIG_IGN);