summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-10-29 07:47:27 +0000
committerDarren Tucker <dtucker@dtucker.net>2019-10-29 20:47:25 +1100
commit2046ed16c1202431b0307674c33a123a113e8297 (patch)
treec29bd65083dc517889cb597a146e6c14c1cbb56a
parent70fc9a6ca4dd33cb2dd400a4dad5db9683a3d284 (diff)
upstream: Signal handler cleanup: remove leftover support for
unreliable signals and now-unneeded save and restore of errno. ok deraadt@ markus@ OpenBSD-Commit-ID: 01dd8a1ebdd991c8629ba1f5237283341a93cd88
-rw-r--r--progressmeter.c4
-rw-r--r--sshd.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/progressmeter.c b/progressmeter.c
index 0e58eddec..72f40f8f9 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: progressmeter.c,v 1.48 2019/05/03 06:06:30 dtucker Exp $ */ 1/* $OpenBSD: progressmeter.c,v 1.49 2019/10/29 07:47:27 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Nils Nordman. All rights reserved. 3 * Copyright (c) 2003 Nils Nordman. All rights reserved.
4 * 4 *
@@ -233,7 +233,6 @@ refresh_progress_meter(int force_update)
233static void 233static void
234sig_alarm(int ignore) 234sig_alarm(int ignore)
235{ 235{
236 signal(SIGALRM, sig_alarm);
237 alarm_fired = 1; 236 alarm_fired = 1;
238 alarm(UPDATE_INTERVAL); 237 alarm(UPDATE_INTERVAL);
239} 238}
@@ -277,7 +276,6 @@ stop_progress_meter(void)
277static void 276static void
278sig_winch(int sig) 277sig_winch(int sig)
279{ 278{
280 signal(SIGWINCH, sig_winch);
281 win_resized = 1; 279 win_resized = 1;
282} 280}
283 281
diff --git a/sshd.c b/sshd.c
index 11571c010..cf7af1c61 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.537 2019/06/28 13:35:04 deraadt Exp $ */ 1/* $OpenBSD: sshd.c,v 1.538 2019/10/29 07:47:27 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -295,10 +295,7 @@ close_startup_pipes(void)
295static void 295static void
296sighup_handler(int sig) 296sighup_handler(int sig)
297{ 297{
298 int save_errno = errno;
299
300 received_sighup = 1; 298 received_sighup = 1;
301 errno = save_errno;
302} 299}
303 300
304/* 301/*