svn commit: r272398 - head/usr.bin/sort

[Baptiste Daroussin]

Author: bapt
Date: Thu Oct  2 06:29:49 2014
New Revision: 272398
URL: https://svnweb.freebsd.org/changeset/base/272398

Log:
  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:
  head/usr.bin/sort/sort.c

Modified: head/usr.bin/sort/sort.c
==============================================================================
--- head/usr.bin/sort/sort.c	Thu Oct  2 06:00:55 2014	(r272397)
+++ head/usr.bin/sort/sort.c	Thu Oct  2 06:29:49 2014	(r272398)
@@ -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);
 			}
 		}