Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will

work.

1 files changed, 77 insertions, 17 deletions

diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index b8e9996d5..08b089bdc 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2000 Damien Miller.  All rights reserved.
+ * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,13 +25,13 @@
 #include "includes.h"
 #include "xmalloc.h"
 
-RCSID("$Id: bsd-misc.c,v 1.12 2003/03/18 18:21:41 tim Exp $");
+RCSID("$Id: bsd-misc.c,v 1.19 2003/08/25 01:16:21 mouring Exp $");
 
 /*
  * NB. duplicate __progname in case it is an alias for argv[0]
  * Otherwise it may get clobbered by setproctitle()
  */
-char *get_progname(char *argv0)
+char *ssh_get_progname(char *argv0)
 {
 #ifdef HAVE___PROGNAME
         extern char *__progname;
@@ -41,21 +41,21 @@ char *get_progname(char *argv0)
         char *p;
 
         if (argv0 == NULL)
-                return "unknown";       /* XXX */
+                return ("unknown");     /* XXX */
         p = strrchr(argv0, '/');
         if (p == NULL)
                 p = argv0;
         else
                 p++;
 
-        return xstrdup(p);
+        return (xstrdup(p));
 #endif
 }
 
 #ifndef HAVE_SETLOGIN
 int setlogin(const char *name)
 {
-        return(0);
+        return (0);
 }
 #endif /* !HAVE_SETLOGIN */
 
@@ -63,21 +63,21 @@ int setlogin(const char *name)
 int innetgr(const char *netgroup, const char *host, 
             const char *user, const char *domain)
 {
-        return(0);
+        return (0);
 }
 #endif /* HAVE_INNETGR */
 
 #if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
 int seteuid(uid_t euid)
 {
-        return(setreuid(-1,euid));
+        return (setreuid(-1, euid));
 }
 #endif /* !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) */
 
 #if !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID)
 int setegid(uid_t egid)
 {
-        return(setresgid(-1,egid,-1));
+        return(setresgid(-1, egid, -1));
 }
 #endif /* !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID) */
 
@@ -88,9 +88,9 @@ const char *strerror(int e)
         extern char *sys_errlist[];
         
         if ((e >= 0) && (e < sys_nerr))
-                return(sys_errlist[e]);
-        else
-                return("unlisted error");
+                return (sys_errlist[e]);
+
+        return ("unlisted error");
 }
 #endif
 
@@ -102,24 +102,25 @@ int utimes(char *filename, struct timeval *tvp)
         ub.actime = tvp[0].tv_sec;
         ub.modtime = tvp[1].tv_sec;
         
-        return(utime(filename, &ub));
+        return (utime(filename, &ub));
 }
 #endif 
 
 #ifndef HAVE_TRUNCATE
-int truncate (const char *path, off_t length)
+int truncate(const char *path, off_t length)
 {
         int fd, ret, saverrno;
 
         fd = open(path, O_WRONLY);
         if (fd < 0)
-                return -1;
+                return (-1);
 
         ret = ftruncate(fd, length);
         saverrno = errno;
-        (void) close (fd);
+        close(fd);
         if (ret == -1)
                 errno = saverrno;
+
         return(ret);
 }
 #endif /* HAVE_TRUNCATE */
@@ -131,7 +132,7 @@ int truncate (const char *path, off_t length)
 int
 setgroups(size_t size, const gid_t *list)
 {
-        return 0;
+        return (0);
 }
 #endif 
 
@@ -166,3 +167,62 @@ int nanosleep(const struct timespec *req, struct timespec *rem)
 
 #endif
 
+#ifndef HAVE_TCGETPGRP
+pid_t
+tcgetpgrp(int fd)
+{
+        int ctty_pgrp;
+
+        if (ioctl(fd, TIOCGPGRP, &ctty_pgrp) == -1)
+                return(-1);
+        else
+                return(ctty_pgrp);
+}
+#endif /* HAVE_TCGETPGRP */
+
+#ifndef HAVE_TCSENDBREAK
+int
+tcsendbreak(int fd, int duration)
+{
+# if defined(TIOCSBRK) && defined(TIOCCBRK)
+        struct timeval sleepytime;
+
+        sleepytime.tv_sec = 0;
+        sleepytime.tv_usec = 400000;
+        if (ioctl(fd, TIOCSBRK, 0) == -1)
+                return (-1);
+        (void)select(0, 0, 0, 0, &sleepytime);
+        if (ioctl(fd, TIOCCBRK, 0) == -1)
+                return (-1);
+        return (0);
+# else
+        return -1;
+# endif
+}
+#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
+        return (signal(sig, act));
+#endif
+}