From owner-svn-src-releng@FreeBSD.ORG  Mon Oct  6 12:08:15 2014
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 470A5302;
 Mon,  6 Oct 2014 12:08:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 32EA8FA4;
 Mon,  6 Oct 2014 12:08:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s96C8FON040864;
 Mon, 6 Oct 2014 12:08:15 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s96C8FAl040863;
 Mon, 6 Oct 2014 12:08:15 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201410061208.s96C8FAl040863@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 6 Oct 2014 12:08:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r272611 - releng/10.1/usr.bin/sort
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Oct 2014 12:08:15 -0000

Author: bapt
Date: Mon Oct  6 12:08:14 2014
New Revision: 272611
URL: https://svnweb.freebsd.org/changeset/base/272611

Log:
  MFC: r272398
  
  Make sure to not skip any argument when converting from deprecated
  +POS1, -POS2 to -kPOS1,POS2, so that sort +0n gets translated to sort -k1,1n
  as it is expected
  
  PR:		193994
  Submitted by:	rodrigo
  Approved by:	re (marius)

Modified:
  releng/10.1/usr.bin/sort/sort.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/usr.bin/sort/sort.c
==============================================================================
--- releng/10.1/usr.bin/sort/sort.c	Mon Oct  6 11:29:50 2014	(r272610)
+++ releng/10.1/usr.bin/sort/sort.c	Mon Oct  6 12:08:14 2014	(r272611)
@@ -897,7 +897,7 @@ fix_obsolete_keys(int *argc, char **argv
 						}
 					}
 				}
-				sprintf(sopt, "-k%d.%d", f1, c1);
+				sprintf(sopt, "-k%d.%d%s", f1, c1, sopts1);
 				argv[i] = sort_strdup(sopt);
 			}
 		}