merge in vnode changes

[unix-history] / usr / src / sys / kern / sys_socket.c

diff --git a/usr/src/sys/kern/sys_socket.c b/usr/src/sys/kern/sys_socket.c
index 168ad23..3e69d8d 100644 (file)
--- a/usr/src/sys/kern/sys_socket.c
+++ b/usr/src/sys/kern/sys_socket.c
@@ -1,9 +1,20 @@
 /*
 /*

- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)sys_socket.c        7.1 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)sys_socket.c        7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -33,9 +44,8 @@ soo_rw(fp, rw, uio)
 {
        int soreceive(), sosend();
 
 {
        int soreceive(), sosend();
 

-       return (
-           (*(rw==UIO_READ?soreceive:sosend))
-             ((struct socket *)fp->f_data, 0, uio, 0, 0));
+       return ((*(rw == UIO_READ ? soreceive : sosend))
+             ((struct socket *)fp->f_data, 0, uio, 0, 0, 0));

 }
 
 soo_ioctl(fp, cmd, data)
 }
 
 soo_ioctl(fp, cmd, data)


@@ -66,11 +76,11 @@ soo_ioctl(fp, cmd, data)
                return (0);
 
        case SIOCSPGRP:
                return (0);
 
        case SIOCSPGRP:

-               so->so_pgrp = *(int *)data;
+               so->so_pgid = *(int *)data;

                return (0);
 
        case SIOCGPGRP:
                return (0);
 
        case SIOCGPGRP:

-               *(int *)data = so->so_pgrp;
+               *(int *)data = so->so_pgid;

                return (0);
 
        case SIOCATMARK:
                return (0);
 
        case SIOCATMARK:


@@ -145,7 +155,7 @@ soo_close(fp)
        struct file *fp;
 {
        int error = 0;
        struct file *fp;
 {
        int error = 0;

-       
+

        if (fp->f_data)
                error = soclose((struct socket *)fp->f_data);
        fp->f_data = 0;
        if (fp->f_data)
                error = soclose((struct socket *)fp->f_data);
        fp->f_data = 0;