From owner-svn-src-all@FreeBSD.ORG  Tue Mar 15 23:54:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 1233)
	id C4B64106566C; Tue, 15 Mar 2011 23:54:19 +0000 (UTC)
Date: Tue, 15 Mar 2011 23:54:19 +0000
From: Alexander Best <arundel@freebsd.org>
To: Jilles Tjoelker <jilles@FreeBSD.org>
Message-ID: <20110315235419.GA45188@freebsd.org>
References: <201103152222.p2FMMB8O061154@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201103152222.p2FMMB8O061154@svn.freebsd.org>
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r219680 - in head/bin: ln rm test
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, 15 Mar 2011 23:54:19 -0000

On Tue Mar 15 11, Jilles Tjoelker wrote:
> Author: jilles
> Date: Tue Mar 15 22:22:11 2011
> New Revision: 219680
> URL: http://svn.freebsd.org/changeset/base/219680
> 
> Log:
>   bin: Prefer strrchr() to rindex().

shouldn't the rindex(3) manual contain a note regarding it's depricated nature
and the fact that strchr(3) is preferred?

cheers.
alex

>   
>   This removes the last index/rindex usage from /bin.
> 
> Modified:
>   head/bin/ln/ln.c
>   head/bin/rm/rm.c
>   head/bin/test/test.c
> 
> Modified: head/bin/ln/ln.c
> ==============================================================================
> --- head/bin/ln/ln.c	Tue Mar 15 21:45:10 2011	(r219679)
> +++ head/bin/ln/ln.c	Tue Mar 15 22:22:11 2011	(r219680)
> @@ -80,7 +80,7 @@ main(int argc, char *argv[])
>  	 * "link", for which the functionality provided is greatly
>  	 * simplified.
>  	 */
> -	if ((p = rindex(argv[0], '/')) == NULL)
> +	if ((p = strrchr(argv[0], '/')) == NULL)
>  		p = argv[0];
>  	else
>  		++p;
> 
> Modified: head/bin/rm/rm.c
> ==============================================================================
> --- head/bin/rm/rm.c	Tue Mar 15 21:45:10 2011	(r219679)
> +++ head/bin/rm/rm.c	Tue Mar 15 22:22:11 2011	(r219680)
> @@ -90,7 +90,7 @@ main(int argc, char *argv[])
>  	 * "unlink", for which the functionality provided is greatly
>  	 * simplified.
>  	 */
> -	if ((p = rindex(argv[0], '/')) == NULL)
> +	if ((p = strrchr(argv[0], '/')) == NULL)
>  		p = argv[0];
>  	else
>  		++p;
> 
> Modified: head/bin/test/test.c
> ==============================================================================
> --- head/bin/test/test.c	Tue Mar 15 21:45:10 2011	(r219679)
> +++ head/bin/test/test.c	Tue Mar 15 22:22:11 2011	(r219680)
> @@ -194,7 +194,7 @@ main(int argc, char **argv)
>  	int	res;
>  	char	*p;
>  
> -	if ((p = rindex(argv[0], '/')) == NULL)
> +	if ((p = strrchr(argv[0], '/')) == NULL)
>  		p = argv[0];
>  	else
>  		p++;

-- 
a13x