svn commit: r272611 - releng/10.1/usr.bin/sort
Baptiste Daroussin
bapt at FreeBSD.org
Mon Oct 6 12:08:15 UTC 2014
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);
}
}
More information about the svn-src-releng
mailing list