diff options
| author | des <des@FreeBSD.org> | 2004-01-07 11:10:17 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-07 11:10:17 +0000 |
| commit | b5d16e713867abc03742aca168b7a54a25c4790b (patch) | |
| tree | d7e09b6d73cb37aa875779151439b14df7273b87 /crypto/openssh/misc.c | |
| parent | dc42ef026434942c55e8af3dd0e975d36afc6843 (diff) | |
| download | FreeBSD-src-b5d16e713867abc03742aca168b7a54a25c4790b.zip FreeBSD-src-b5d16e713867abc03742aca168b7a54a25c4790b.tar.gz | |
Vendor import of OpenSSH 3.7.1p2.
Diffstat (limited to 'crypto/openssh/misc.c')
| -rw-r--r-- | crypto/openssh/misc.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index 84c94f9..ac616de 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: misc.c,v 1.20 2002/12/13 10:03:15 markus Exp $"); +RCSID("$OpenBSD: misc.c,v 1.22 2003/09/18 08:49:45 markus Exp $"); #include "misc.h" #include "log.h" @@ -60,7 +60,7 @@ set_nonblock(int fd) debug2("fd %d is O_NONBLOCK", fd); return; } - debug("fd %d setting O_NONBLOCK", fd); + debug2("fd %d setting O_NONBLOCK", fd); val |= O_NONBLOCK; if (fcntl(fd, F_SETFL, val) == -1) debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s", @@ -326,29 +326,3 @@ addargs(arglist *args, char *fmt, ...) args->list[args->num++] = xstrdup(buf); args->list[args->num] = NULL; } - -mysig_t -mysignal(int sig, mysig_t act) -{ -#ifdef HAVE_SIGACTION - struct sigaction sa, osa; - - if (sigaction(sig, NULL, &osa) == -1) - return (mysig_t) -1; - if (osa.sa_handler != act) { - memset(&sa, 0, sizeof(sa)); - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; -#if defined(SA_INTERRUPT) - if (sig == SIGALRM) - sa.sa_flags |= SA_INTERRUPT; -#endif - sa.sa_handler = act; - if (sigaction(sig, &sa, NULL) == -1) - return (mysig_t) -1; - } - return (osa.sa_handler); -#else - return (signal(sig, act)); -#endif -} |
