From owner-svn-src-head@FreeBSD.ORG  Mon Jan  4 10:59:14 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7FCF106566B;
	Mon,  4 Jan 2010 10:59:14 +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 D7F378FC1F;
	Mon,  4 Jan 2010 10:59:14 +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 o04AxE6a038225;
	Mon, 4 Jan 2010 10:59:14 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o04AxEIN038222;
	Mon, 4 Jan 2010 10:59:14 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201001041059.o04AxEIN038222@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 4 Jan 2010 10:59:14 +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: r201489 - head/tools/regression/usr.bin/pkill
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2010 10:59:15 -0000

Author: obrien
Date: Mon Jan  4 10:59:14 2010
New Revision: 201489
URL: http://svn.freebsd.org/changeset/base/201489

Log:
  Catch up with UNIX98-style PTY's.

Modified:
  head/tools/regression/usr.bin/pkill/pgrep-t.t
  head/tools/regression/usr.bin/pkill/pkill-t.t

Modified: head/tools/regression/usr.bin/pkill/pgrep-t.t
==============================================================================
--- head/tools/regression/usr.bin/pkill/pgrep-t.t	Mon Jan  4 10:58:08 2010	(r201488)
+++ head/tools/regression/usr.bin/pkill/pgrep-t.t	Mon Jan  4 10:59:14 2010	(r201489)
@@ -11,7 +11,10 @@ if [ "$tty" = "??" ]; then
 	tty="-"
 	ttyshort="-"
 else
-	ttyshort=`echo $tty | cut -c 4-`
+	case $tty in
+	pts/*)	ttyshort=`echo $tty | cut -c 5-` ;;
+	*)		ttyshort=`echo $tty | cut -c 4-` ;;
+	esac
 fi
 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 ln -sf /bin/sleep $sleep

Modified: head/tools/regression/usr.bin/pkill/pkill-t.t
==============================================================================
--- head/tools/regression/usr.bin/pkill/pkill-t.t	Mon Jan  4 10:58:08 2010	(r201488)
+++ head/tools/regression/usr.bin/pkill/pkill-t.t	Mon Jan  4 10:59:14 2010	(r201489)
@@ -11,7 +11,10 @@ if [ "$tty" = "??" ]; then
 	tty="-"
 	ttyshort="-"
 else
-	ttyshort=`echo $tty | cut -c 4-`
+	case $tty in
+	pts/*)	ttyshort=`echo $tty | cut -c 5-` ;;
+	*)		ttyshort=`echo $tty | cut -c 4-` ;;
+	esac
 fi
 sleep=`mktemp /tmp/$base.XXXXXX` || exit 1
 ln -sf /bin/sleep $sleep