Import openssh_7.7p1.orig.tar.gz

1 files changed, 43 insertions, 38 deletions

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 29f6ad38c..3daf61071 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -104,16 +104,6 @@ const char *strerror(int e)
 }
 #endif
 
-#if !defined(HAVE_STRSIGNAL)
-char *strsignal(int sig)
-{
-        static char buf[16];
-
-        (void)snprintf(buf, sizeof(buf), "%d", sig);
-        return buf;
-}
-#endif
-
 #ifndef HAVE_UTIMES
 int utimes(char *filename, struct timeval *tvp)
 {
@@ -221,33 +211,6 @@ tcsendbreak(int fd, int duration)
 }
 #endif /* HAVE_TCSENDBREAK */
 
-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;
-#ifdef 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
-        #undef signal
-        return (signal(sig, act));
-#endif
-}
-
 #ifndef HAVE_STRDUP
 char *
 strdup(const char *str)
@@ -275,7 +238,7 @@ isblank(int c)
 pid_t
 getpgid(pid_t pid)
 {
-#if defined(HAVE_GETPGRP) && !defined(GETPGRP_VOID)
+#if defined(HAVE_GETPGRP) && !defined(GETPGRP_VOID) && GETPGRP_VOID == 0
         return getpgrp(pid);
 #elif defined(HAVE_GETPGRP)
         if (pid == 0)
@@ -319,3 +282,45 @@ llabs(long long j)
         return (j < 0 ? -j : j);
 }
 #endif
+
+#ifndef HAVE_BZERO
+void
+bzero(void *b, size_t n)
+{
+        (void)memset(b, 0, n);
+}
+#endif
+
+#ifndef HAVE_RAISE
+int
+raise(int sig)
+{
+        kill(getpid(), sig);
+}
+#endif
+
+#ifndef HAVE_GETSID
+pid_t
+getsid(pid_t pid)
+{
+        errno = ENOSYS;
+        return -1;
+}
+#endif
+
+#ifdef FFLUSH_NULL_BUG
+#undef fflush
+int _ssh_compat_fflush(FILE *f)
+{
+        int r1, r2, r3;
+
+        if (f == NULL) {
+                r2 = fflush(stdout);
+                r3 = fflush(stderr);
+                if (r1 == -1 || r2 == -1 || r3 == -1)
+                        return -1;
+                return 0;
+        }
+        return fflush(f);
+}
+#endif