diff options
author | Artur Grabowski <art@cvs.openbsd.org> | 1998-09-08 20:49:34 +0000 |
---|---|---|
committer | Artur Grabowski <art@cvs.openbsd.org> | 1998-09-08 20:49:34 +0000 |
commit | ab31f145531991a3448ce60687fcdc2fb120ea03 (patch) | |
tree | a1d840506c46028c94af8045a3185472cab6b480 /usr.bin/fstat | |
parent | 54a23384fa99d9dd3a16b7547249472cef37bb5d (diff) |
back out the pipe code that breaks on sparc
Diffstat (limited to 'usr.bin/fstat')
-rw-r--r-- | usr.bin/fstat/fstat.c | 50 |
1 files changed, 4 insertions, 46 deletions
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index 85007816b6a..d4497c8c280 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fstat.c,v 1.19 1998/09/07 01:04:13 art Exp $ */ +/* $OpenBSD: fstat.c,v 1.20 1998/09/08 20:49:33 art Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)fstat.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$OpenBSD: fstat.c,v 1.19 1998/09/07 01:04:13 art Exp $"; +static char *rcsid = "$OpenBSD: fstat.c,v 1.20 1998/09/08 20:49:33 art Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -80,8 +80,6 @@ static char *rcsid = "$OpenBSD: fstat.c,v 1.19 1998/09/07 01:04:13 art Exp $"; #include <arpa/inet.h> -#include <sys/pipe.h> - #include <ctype.h> #include <errno.h> #include <kvm.h> @@ -146,7 +144,6 @@ void socktrans __P((struct socket *, int)); void usage __P((void)); void vtrans __P((struct vnode *, int, int)); int getfname __P((char *)); -void pipetrans __P((struct pipe *, int)); int main(argc, argv) @@ -353,10 +350,8 @@ dofiles(kp) else if (file.f_type == DTYPE_SOCKET) { if (checkfile == 0) socktrans((struct socket *)file.f_data, i); - } else if (file.f_type == DTYPE_PIPE) { - if (checkfile == 0) - pipetrans((struct pipe *)file.f_data, i); - } else { + } + else { dprintf("unknown file type %d for file %d of pid %d", file.f_type, i, Pid); } @@ -631,43 +626,6 @@ getmnton(m) } void -pipetrans(pipe, i) - struct pipe *pipe; - int i; -{ - struct pipe pi; - void *maxaddr; - - PREFIX(i); - - printf(" "); - - /* fill in socket */ - if (!KVM_READ(pipe, &pi, sizeof(struct pipe))) { - dprintf("can't read pipe at %p", pipe); - goto bad; - } - - /* - * We don't have enough space to fit both peer and own address, so - * we select the higher address so both ends of the pipe have the - * same visible addr. (it's the higher address because when the other - * end closes, it becomes 0) - */ - maxaddr = MAX(pipe, pi.pipe_peer); - - printf("pipe %p state: %s%s%s", maxaddr, - (pi.pipe_state & PIPE_WANTR) ? "R" : "", - (pi.pipe_state & PIPE_WANTW) ? "W" : "", - (pi.pipe_state & PIPE_EOF) ? "E" : ""); - - printf("\n"); - return; -bad: - printf("* error\n"); -} - -void socktrans(sock, i) struct socket *sock; int i; |