gc OLD_PIPE.

5 files changed, 5 insertions, 68 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 754659f3510..bdfa2c6e119 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_descrip.c,v 1.27 2001/05/14 13:28:20 art Exp $	*/
+/*	$OpenBSD: kern_descrip.c,v 1.28 2001/05/14 13:43:53 art Exp $	*/
 /*	$NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $	*/
 
 /*
@@ -548,10 +548,7 @@ sys_fpathconf(p, v, retval)
 	    (fp = fdp->fd_ofiles[fd]) == NULL)
 		return (EBADF);
 	switch (fp->f_type) {
-
-#ifndef OLD_PIPE
 	case DTYPE_PIPE:
-#endif
 	case DTYPE_SOCKET:
 		if (SCARG(uap, name) != _PC_PIPE_BUF)
 			return (EINVAL);
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 3509fe89246..6817df31121 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_pipe.c,v 1.29 2001/05/14 12:38:47 art Exp $	*/
+/*	$OpenBSD: sys_pipe.c,v 1.30 2001/05/14 13:43:53 art Exp $	*/
 
 /*
  * Copyright (c) 1996 John S. Dyson
@@ -19,8 +19,6 @@
  *    are met.
  */
 
-#ifndef OLD_PIPE
-
 /*
  * This file contains a high-performance replacement for the socket-based
  * pipes scheme originally used in FreeBSD/4.4Lite.  It does not support
@@ -760,7 +758,6 @@ pipeclose(cpipe)
 		free(cpipe, M_PIPE);
 	}
 }
-#endif
 
 int
 pipe_kqfilter(struct file *fp, struct knote *kn)
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index ad4353c8fd5..fddbf376b58 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.36 2001/02/19 18:21:30 art Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.37 2001/05/14 13:43:54 art Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -891,55 +891,6 @@ sys_pipe(p, v, retval)
 	return (error);
 }
 
-#ifdef OLD_PIPE
-
-/* ARGSUSED */
-int
-sys_opipe(p, v, retval)
-	struct proc *p;
-	void *v;
-	register_t *retval;
-{
-	register struct filedesc *fdp = p->p_fd;
-	struct file *rf, *wf;
-	struct socket *rso, *wso;
-	int fd, error;
-
-	if ((error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0)) != 0)
-		return (error);
-	if ((error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0)) != 0)
-		goto free1;
-	if ((error = falloc(p, &rf, &fd)) != 0)
-		goto free2;
-	retval[0] = fd;
-	rf->f_flag = FREAD;
-	rf->f_type = DTYPE_SOCKET;
-	rf->f_ops = &socketops;
-	rf->f_data = (caddr_t)rso;
-	if ((error = falloc(p, &wf, &fd)) != 0)
-		goto free3;
-	wf->f_flag = FWRITE;
-	wf->f_type = DTYPE_SOCKET;
-	wf->f_ops = &socketops;
-	wf->f_data = (caddr_t)wso;
-	retval[1] = fd;
-	if ((error = unp_connect2(wso, rso)) != 0)
-		goto free4;
-	return (0);
-free4:
-	ffree(wf);
-	fdremove(fdp, retval[1]);
-free3:
-	ffree(rf);
-	fdremove(fdp, retval[0]);
-free2:
-	(void)soclose(wso);
-free1:
-	(void)soclose(rso);
-	return (error);
-}
-#endif
-
 /*
  * Get socket name.
  */
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 0bb6d1acb90..163f1ed1a0f 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdesc_vnops.c,v 1.18 2001/05/14 11:04:05 art Exp $	*/
+/*	$OpenBSD: fdesc_vnops.c,v 1.19 2001/05/14 13:43:54 art Exp $	*/
 /*	$NetBSD: fdesc_vnops.c,v 1.32 1996/04/11 11:24:29 mrg Exp $	*/
 
 /*
@@ -489,9 +489,6 @@ fdesc_attr(fd, vap, cred, p)
 		break;
 
 	case DTYPE_PIPE:
-#ifdef OLD_PIPE
-		error = 0;
-#else
 		error = pipe_stat(fp, &stb, p);
 		if (error == 0) {
 			vattr_null(vap);
@@ -512,7 +509,6 @@ fdesc_attr(fd, vap, cred, p)
 			vap->va_rdev = stb.st_rdev;
 			vap->va_bytes = stb.st_blocks * stb.st_blksize;
 		}
-#endif
 		break;
 
 	default:
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index de6f0e23ebc..3376222abb7 100644
--- a/sys/sys/pipe.h
+++ b/sys/sys/pipe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipe.h,v 1.5 2001/05/14 10:51:25 art Exp $	*/
+/*	$OpenBSD: pipe.h,v 1.6 2001/05/14 13:43:52 art Exp $	*/
 
 /*
  * Copyright (c) 1996 John S. Dyson
@@ -24,8 +24,6 @@
 #ifndef _SYS_PIPE_H_
 #define _SYS_PIPE_H_
 
-#ifndef OLD_PIPE
-
 #ifndef _KERNEL
 #include <sys/time.h>			/* for struct timeval */
 #include <sys/select.h>			/* for struct selinfo */
@@ -90,6 +88,4 @@ struct pipe {
 int	pipe_stat __P((struct file *fp, struct stat *ub, struct proc *p));
 #endif /* _KERNEL */
 
-#endif /* !OLD_PIPE */
-
 #endif /* !_SYS_PIPE_H_ */