From owner-freebsd-stable@FreeBSD.ORG  Fri Aug 15 14:11:20 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9B8B737B429
	for <freebsd-stable@freebsd.org>;
	Fri, 15 Aug 2003 14:11:20 -0700 (PDT)
Received: from fledge.watson.org (fledge.watson.org [204.156.12.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D73D443F85
	for <freebsd-stable@freebsd.org>;
	Fri, 15 Aug 2003 14:11:19 -0700 (PDT)
	(envelope-from robert@fledge.watson.org)
Received: from fledge.watson.org (localhost [127.0.0.1])
	by fledge.watson.org (8.12.9/8.12.9) with ESMTP id h7FLAiAL050503;
	Fri, 15 Aug 2003 17:10:44 -0400 (EDT)
	(envelope-from robert@fledge.watson.org)
Received: from localhost (robert@localhost)h7FLAiuC050500;
	Fri, 15 Aug 2003 17:10:44 -0400 (EDT)
Date: Fri, 15 Aug 2003 17:10:43 -0400 (EDT)
From: Robert Watson <rwatson@freebsd.org>
X-Sender: robert@fledge.watson.org
To: Jonathan Chen <jonc@chen.org.nz>
In-Reply-To: <20030814222123.GB65897@grimoire.chen.org.nz>
Message-ID: <Pine.NEB.3.96L.1030815171009.11577D-100000@fledge.watson.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: Eric S <ejs@bfd.com>
cc: freebsd-stable@freebsd.org
Subject: Re: odd uptime error message
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Aug 2003 21:11:20 -0000

Here's the patch against finger to potentially MFC as well.

Robert N M Watson             FreeBSD Core Team, TrustedBSD Projects
robert@fledge.watson.org      Network Associates Laboratories

Index: lprint.c
===================================================================
RCS file: /data/ncvs/src/usr.bin/finger/lprint.c,v
retrieving revision 1.10.2.4
diff -u -r1.10.2.4 lprint.c
--- lprint.c	3 Jul 2002 01:14:24 -0000	1.10.2.4
+++ lprint.c	15 Aug 2003 21:09:50 -0000
@@ -191,7 +191,8 @@
 			 * idle time.  Follow with a comma if a remote login.
 			 */
 			delta = gmtime(&w->idletime);
-			if (delta->tm_yday || delta->tm_hour || delta->tm_min) {
+			if (w->idletime != -1 && (delta->tm_yday ||
+			    delta->tm_hour || delta->tm_min)) {
 				cpr += printf("%-*s idle ",
 				    maxlen - (int)strlen(w->tty) + 1, ",");
 				if (delta->tm_yday > 0) {
Index: util.c
===================================================================
RCS file: /data/ncvs/src/usr.bin/finger/util.c,v
retrieving revision 1.8.2.6
diff -u -r1.8.2.6 util.c
--- util.c	3 Jul 2002 01:14:24 -0000	1.8.2.6
+++ util.c	15 Aug 2003 21:09:16 -0000
@@ -324,10 +324,23 @@
 	extern time_t now;
 	struct stat sb;
 	time_t touched;
+	int error;
 
 	(void)snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_DEV, w->tty);
-	if (stat(tbuf, &sb) < 0) {
+
+	error = stat(tbuf, &sb);
+	if (error < 0 && errno == ENOENT) {
+		/*
+		 * The terminal listed is not actually a terminal (i.e.,
+		 * ":0").  This is a failure, so we'll skip printing
+		 * out the idle time, which is non-ideal but better
+		 * than a bogus warning and idle time.
+		 */
+		w->idletime = -1;
+		return;
+	} else if (error < 0) {
 		warn("%s", tbuf);
+		w->idletime = -1;
 		return;
 	}
 	touched = sb.st_atime;