From owner-svn-src-all@FreeBSD.ORG  Mon Jan  4 10:50:18 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C3F7106566C;
	Mon,  4 Jan 2010 10:50:18 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BCDA8FC0A;
	Mon,  4 Jan 2010 10:50:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o04AoH70036179;
	Mon, 4 Jan 2010 10:50:17 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o04AoHJS036178;
	Mon, 4 Jan 2010 10:50:17 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201001041050.o04AoHJS036178@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 4 Jan 2010 10:50:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201487 - head/bin/pkill
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2010 10:50:18 -0000

Author: obrien
Date: Mon Jan  4 10:50:17 2010
New Revision: 201487
URL: http://svn.freebsd.org/changeset/base/201487

Log:
  Committed the wrong version in r201484.  This time really fix the "-t"
  functionality.  Per the regression tests (pgrep-t.t & pkill-t.t), "-t"
  should accept "v1", which means a plain number should be accepted for
  UNIX98-style PTY's.

Modified:
  head/bin/pkill/pkill.c

Modified: head/bin/pkill/pkill.c
==============================================================================
--- head/bin/pkill/pkill.c	Mon Jan  4 10:39:16 2010	(r201486)
+++ head/bin/pkill/pkill.c	Mon Jan  4 10:50:17 2010	(r201487)
@@ -670,6 +670,20 @@ makelist(struct listhead *head, enum lis
 				if (li->li_number == 0)
 					li->li_number = -1;	/* any jail */
 				break;
+			case LT_TTY:
+				if (li->li_number < 0)
+					errx(STATUS_BADUSAGE,
+					     "Negative /dev/pts tty `%s'", sp);
+				snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s",
+				    sp);
+				if (stat(buf, &st) != -1)
+					goto foundtty;
+				if (errno == ENOENT)
+					errx(STATUS_BADUSAGE, "No such tty: `"
+					    _PATH_DEV "pts/%s'", sp);
+				err(STATUS_ERROR, "Cannot access `"
+				    _PATH_DEV "pts/%s'", sp);
+				break;
 			default:
 				break;
 			}
@@ -705,10 +719,6 @@ makelist(struct listhead *head, enum lis
 			if (stat(buf, &st) != -1)
 				goto foundtty;
 
-			snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s", cp);
-			if (stat(buf, &st) != -1)
-				goto foundtty;
-
 			if (errno == ENOENT)
 				errx(STATUS_BADUSAGE, "No such tty: `%s'", sp);
 			err(STATUS_ERROR, "Cannot access `%s'", sp);