fix to previous 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 49cfee9..ab7a513 100644 (file)
--- a/usr/src/sys/kern/sys_socket.c
+++ b/usr/src/sys/kern/sys_socket.c
@@ -4,25 +4,22 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sys_socket.c        7.9 (Berkeley) %G%
+ *     @(#)sys_socket.c        7.12 (Berkeley) %G%

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

-#include "user.h"

 #include "file.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "ioctl.h"
 #include "file.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "ioctl.h"

-#include "uio.h"

 #include "stat.h"
 
 #include "stat.h"
 

-#include "../net/if.h"
-#include "../net/route.h"
+#include "net/if.h"
+#include "net/route.h"

 
 

-int    soo_read(), soo_write(), soo_ioctl(), soo_select(), soo_close();

 struct fileops socketops =
     { soo_read, soo_write, soo_ioctl, soo_select, soo_close };
 
 struct fileops socketops =
     { soo_read, soo_write, soo_ioctl, soo_select, soo_close };
 


@@ -151,13 +148,16 @@ soo_stat(so, ub)
 {
 
        bzero((caddr_t)ub, sizeof (*ub));
 {
 
        bzero((caddr_t)ub, sizeof (*ub));

+       ub->st_mode = S_IFSOCK;

        return ((*so->so_proto->pr_usrreq)(so, PRU_SENSE,
            (struct mbuf *)ub, (struct mbuf *)0, 
            (struct mbuf *)0));
 }
 
        return ((*so->so_proto->pr_usrreq)(so, PRU_SENSE,
            (struct mbuf *)ub, (struct mbuf *)0, 
            (struct mbuf *)0));
 }
 

-soo_close(fp)
+/* ARGSUSED */
+soo_close(fp, p)

        struct file *fp;
        struct file *fp;

+       struct proc *p;

 {
        int error = 0;
 
 {
        int error = 0;