From owner-svn-src-head@FreeBSD.ORG  Sat Jan  5 23:54:14 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DF8E3CCE
 for <svn-src-head@freebsd.org>; Sat,  5 Jan 2013 23:54:14 +0000 (UTC)
 (envelope-from mailer-daemon@vniz.net)
Received: from mail-la0-f48.google.com (mail-la0-f48.google.com
 [209.85.215.48]) by mx1.freebsd.org (Postfix) with ESMTP id 4E77CA99
 for <svn-src-head@freebsd.org>; Sat,  5 Jan 2013 23:54:13 +0000 (UTC)
Received: by mail-la0-f48.google.com with SMTP id ej20so12276391lab.35
 for <svn-src-head@freebsd.org>; Sat, 05 Jan 2013 15:54:06 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=x-received:message-id:disposition-notification-to:date:from
 :user-agent:mime-version:to:cc:subject:references:in-reply-to
 :openpgp:content-type:content-transfer-encoding:x-gm-message-state;
 bh=JW5vGkFnSzqu2a58iF6mXcVvnta2xy5FhtdrV+6tr3o=;
 b=JC7nLXy1GGECbhWW50r/Djx0VEcdZjovvb7ehdugk+aIBkNwXHOIrx61RYtxHFu+U3
 pFxTudYNhrhOehRrVvD1+z0ePf/FTnkdv3omdxoflwlJPMxr0kmJG+MReubrems0d6lD
 fw4ZucwwIPjndSLvKxQxjZrdKrbM4+ajan1KZKU45QE7wxhp2plkcBfSpHRMNz9tpzgH
 erIRPCu9/LIvTjyF6oIJLpUPMcYY0QTfy2nfKtDQdKUDS0cFZI/7lqmVmwUlHZ2TyYV+
 0utRN1qyU9yQIDW/AGgOzf3nFXhMykRRAr9v1OkF1nJwCUIPUbmm9QGvXHOsl8eOjzEG
 +oyg==
X-Received: by 10.112.88.7 with SMTP id bc7mr23476639lbb.108.1357430046681;
 Sat, 05 Jan 2013 15:54:06 -0800 (PST)
Received: from [192.168.1.2] ([89.169.163.3])
 by mx.google.com with ESMTPS id fj2sm19274601lbb.6.2013.01.05.15.54.05
 (version=SSLv3 cipher=OTHER); Sat, 05 Jan 2013 15:54:06 -0800 (PST)
Message-ID: <50E8BD1D.7030209@freebsd.org>
Date: Sun, 06 Jan 2013 03:54:05 +0400
From: Andrey Chernov <ache@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Gabor Kovesdan <gabor@FreeBSD.org>
Subject: Re: svn commit: r245057 - head/usr.bin/grep
References: <201301051452.r05EqWHt051825@svn.freebsd.org>
In-Reply-To: <201301051452.r05EqWHt051825@svn.freebsd.org>
OpenPGP: id=964474DD
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Gm-Message-State: ALoCoQmXf5HwA30KdOrXScS0JPCp5ZhuNa7M5G3ll/fH50aqG6hMfuq/UKExL5uEyMOdkPIrjGqs
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 05 Jan 2013 23:54:14 -0000

Thanks. I think the fix below can be improved further, because strdup(3)
is unneeded here and can be omitted. We don't have either constant
argument nor want to preserve it.

On 05.01.2013 18:52, Gabor Kovesdan wrote:
>  		case 'e':
> -			add_pattern(optarg, strlen(optarg));
> +			{
> +				char *token;
> +				char *string = strdup(optarg);
> +
> +				while ((token = strsep(&string, "\n")) != NULL)
> +					add_pattern(token, strlen(token));
> +			}
>  			needpattern = 0;
>  			break;
>  		case 'F':
> @@ -668,7 +674,11 @@ main(int argc, char *argv[])
>  
>  	/* Process patterns from command line */
>  	if (aargc != 0 && needpattern) {
> -		add_pattern(*aargv, strlen(*aargv));
> +		char *token;
> +		char *string = strdup(*aargv);
> +
> +		while ((token = strsep(&string, "\n")) != NULL)
> +			add_pattern(token, strlen(token));
>  		--aargc;
>  		++aargv;
>  	}
>