Date: Mon, 6 Oct 2014 09:15:10 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r272603 - stable/10/usr.bin/sort Message-ID: <201410060915.s969FAxx060052@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Oct 6 09:15:09 2014 New Revision: 272603 URL: https://svnweb.freebsd.org/changeset/base/272603 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 MFC after: 3 days Modified: stable/10/usr.bin/sort/sort.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/sort/sort.c ============================================================================== --- stable/10/usr.bin/sort/sort.c Mon Oct 6 09:00:53 2014 (r272602) +++ stable/10/usr.bin/sort/sort.c Mon Oct 6 09:15:09 2014 (r272603) @@ -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); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410060915.s969FAxx060052>