From owner-svn-src-all@FreeBSD.ORG  Tue Jan  3 11:13:08 2012
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 5333B106564A;
	Tue,  3 Jan 2012 11:13:08 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4203D8FC17;
	Tue,  3 Jan 2012 11:13:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q03BD8xd021048;
	Tue, 3 Jan 2012 11:13:08 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q03BD8Vw021046;
	Tue, 3 Jan 2012 11:13:08 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201201031113.q03BD8Vw021046@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 3 Jan 2012 11:13:08 +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: r229386 - head/usr.bin/talk
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: Tue, 03 Jan 2012 11:13:08 -0000

Author: ed
Date: Tue Jan  3 11:13:07 2012
New Revision: 229386
URL: http://svn.freebsd.org/changeset/base/229386

Log:
  Remove hand-written version of strcspn().
  
  The code searches for the first occurence of @, : or !. Upon failure, it
  returns the index of \0. This is exactly what strcspn() does.

Modified:
  head/usr.bin/talk/get_names.c

Modified: head/usr.bin/talk/get_names.c
==============================================================================
--- head/usr.bin/talk/get_names.c	Tue Jan  3 11:10:15 2012	(r229385)
+++ head/usr.bin/talk/get_names.c	Tue Jan  3 11:13:07 2012	(r229386)
@@ -80,8 +80,7 @@ get_names(int argc, char *argv[])
 	gethostname(hostname, sizeof (hostname));
 	my_machine_name = hostname;
 	/* check for, and strip out, the machine name of the target */
-	for (cp = argv[1]; *cp && !index("@:!", *cp); cp++)
-		;
+	cp = argv[1] + strcspn(argv[1], "@:!");
 	if (*cp == '\0') {
 		/* this is a local to local talk */
 		his_name = argv[1];