From owner-svn-src-all@FreeBSD.ORG  Thu May 17 13:08:31 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 3BB591065670;
	Thu, 17 May 2012 13:08:31 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 269CE8FC0A;
	Thu, 17 May 2012 13:08:31 +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 q4HD8V68099996;
	Thu, 17 May 2012 13:08:31 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4HD8U3o099994;
	Thu, 17 May 2012 13:08:30 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201205171308.q4HD8U3o099994@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 17 May 2012 13:08:30 +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: r235546 - head/usr.bin/sort
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: Thu, 17 May 2012 13:08:31 -0000

Author: gabor
Date: Thu May 17 13:08:30 2012
New Revision: 235546
URL: http://svn.freebsd.org/changeset/base/235546

Log:
  - Fix -o option that was broken by my clang compile fix
  
  Submitted by:	Oleg Moskalenko <oleg.moskalenko@citrix.com>

Modified:
  head/usr.bin/sort/sort.c

Modified: head/usr.bin/sort/sort.c
==============================================================================
--- head/usr.bin/sort/sort.c	Thu May 17 11:53:38 2012	(r235545)
+++ head/usr.bin/sort/sort.c	Thu May 17 13:08:30 2012	(r235546)
@@ -1049,9 +1049,8 @@ main(int argc, char **argv)
 				sort_opts_vals.mflag = true;
 				break;
 			case 'o':
-				outfile = sort_realloc(outfile, sizeof(char) *
-				    (strlen(optarg) + 1));
-				strlcpy(outfile, optarg, strlen(outfile));
+				outfile = sort_realloc(outfile, (strlen(optarg) + 1));
+				strcpy(outfile, optarg);
 				break;
 			case 's':
 				sort_opts_vals.sflag = true;