- (djm) CVS OpenBSD sync:

[openssh.git] / next-posix.c

diff --git a/next-posix.c b/next-posix.c
index de7723e977cf7d824af0618f7f41cdf042293f19..d5cc733d08e2e0e19dc54ab73a3612f1911a3259 100644 (file)
--- a/next-posix.c
+++ b/next-posix.c
@@ -1,3 +1,25 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "includes.h"
 
 #ifdef HAVE_NEXT
@@ -8,46 +30,32 @@
 pid_t 
 posix_wait(int *status)
 {
-       #undef wait                     /* Use NeXT's wait() function */
        union wait statusp;
        pid_t wait_pid;
 
+       #undef wait                     /* Use NeXT's wait() function */
        wait_pid = wait(&statusp);
        status = (int *) statusp.w_status;
 
        return wait_pid;
 }
 
-
-int                                          
-posix_utime(char *filename,struct utimbuf *buf)
-{                                            
-        time_t timep[2];                     
-                                             
-        timep[0] = buf->actime;              
-        timep[1] = buf->modtime;             
-
-        #undef utime                   /* Use NeXT's utime() function */ 
-        return utime(filename,timep);        
-}                                            
-
-
-int
-waitpid(int    pid, int        *stat_loc, int  options)
+pid_t
+waitpid(int pid, int *stat_loc, int options)
 {
+       union wait statusp;
+       pid_t wait_pid;
+
        if (pid <= 0) {
                if (pid != -1) {
                        errno = EINVAL;
                        return -1;
                }
-               pid = 0;        /* wait4() expects pid=0 for indiscriminate wait. */
+               pid = 0;   /* wait4() wants pid=0 for indiscriminate wait. */
        }
-       return wait4(pid, (union wait *)stat_loc, options, NULL);
-}
-
-pid_t setsid(void)
-{
-       return setpgrp(0, getpid());
+        wait_pid = wait4(pid, &statusp, options, NULL);
+        stat_loc = (int *)statusp.w_status;            
+        return wait_pid;                               
 }
 
 int
@@ -81,10 +89,7 @@ tcsetattr(int fd, int opt, const struct termios *t)
 
 int tcsetpgrp(int fd, pid_t pgrp)
 {
-       int s;
-
-       s = pgrp;
-       return (ioctl(fd, TIOCSPGRP, &s));
+       return (ioctl(fd, TIOCSPGRP, &pgrp));
 }
 
 speed_t cfgetospeed(const struct termios *t)