From a987e5b063b72307e9ab781869ed861743165339 Mon Sep 17 00:00:00 2001
From: sheldonh <sheldonh@FreeBSD.org>
Date: Wed, 30 Jun 1999 21:46:03 +0000
Subject: Allow the use of `-' as an argument to the -w option so that standard
 input may be used (e.g. gunzip -c /var/log/wtmp.Jan.gz | ac -w - ).

PR:	12467
Submitted by:	wollman
---
 usr.sbin/ac/ac.8 |  5 ++++-
 usr.sbin/ac/ac.c | 20 ++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'usr.sbin/ac')

diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index 341226a..b19e200 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ac.8,v 1.9 1997/02/22 16:01:10 peter Exp $
+.\"	$Id: ac.8,v 1.10 1997/09/01 06:11:40 charnier Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
@@ -84,6 +84,9 @@ Read connect time data from
 .Ar wtmp
 instead of the default file,
 .Pa /var/log/wtmp .
+If
+.Ql \&-
+is specified, read records from the standard input.
 .It Ar users ...
 Display totals for the given individuals only.
 .El
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 0916d3c..1d73bd0 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ac.c,v 1.9 1998/05/25 05:21:29 steve Exp $";
+	"$Id: ac.c,v 1.10 1998/07/02 05:34:08 phk Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -106,12 +106,20 @@ file(name)
 {
 	FILE *fp;
 
-	if ((fp = fopen(name, "r")) == NULL)
-		err(1, "%s", name);
-	/* in case we want to discriminate */
-	if (strcmp(_PATH_WTMP, name))
+	/*
+	 * Added by GAW...
+	 */
+	if (strcmp("-", name) == 0) {
 		Flags |= AC_W;
-	return fp;
+		return (stdin);
+	} else {
+		if ((fp = fopen(name, "r")) == NULL)
+			err(1, "%s", name);
+		/* in case we want to discriminate */
+		if (strcmp(_PATH_WTMP, name))
+			Flags |= AC_W;
+		return fp;
+	}
 }
 
 struct tty_list *
-- 
cgit v1.1