make pstat -f show locking

ok art@ tedu@
much help from pedro@

2 files changed, 7 insertions, 13 deletions

diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 7a703560617..89d407a9907 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pstat.8,v 1.26 2004/03/17 09:59:19 jmc Exp $
+.\"	$OpenBSD: pstat.8,v 1.27 2004/08/03 04:11:49 mjc Exp $
 .\"	$NetBSD: pstat.8,v 1.9.4.1 1996/06/02 09:08:17 mrg Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -73,10 +73,8 @@ open for reading
 open for writing
 .It A
 open for appending
-.It S
-shared lock present
-.It X
-exclusive lock present
+.It L
+exclusive or shared lock present
 .It I
 signal pgrp when data ready
 .El
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 526ac80d90f..c5b91596316 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.46 2004/03/16 23:11:20 jmc Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.47 2004/08/03 04:11:49 mjc Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 from: static char sccsid[] = "@(#)pstat.c	8.9 (Berkeley) 2/16/94";
 #else
-static char *rcsid = "$OpenBSD: pstat.c,v 1.46 2004/03/16 23:11:20 jmc Exp $";
+static char *rcsid = "$OpenBSD: pstat.c,v 1.47 2004/08/03 04:11:49 mjc Exp $";
 #endif
 #endif /* not lint */
 
@@ -916,12 +916,8 @@ filemode(void)
 			*fbp++ = 'W';
 		if (fp.f_flag & FAPPEND)
 			*fbp++ = 'A';
-#ifdef FSHLOCK	/* currently gone */
-		if (fp.f_flag & FSHLOCK)
-			*fbp++ = 'S';
-		if (fp.f_flag & FEXLOCK)
-			*fbp++ = 'X';
-#endif
+		if (fp.f_flag & FHASLOCK)
+			*fbp++ = 'L';
 		if (fp.f_flag & FASYNC)
 			*fbp++ = 'I';
 		*fbp = '\0';