svn commit: r310872 - head/usr.bin/sdiff

[Baptiste Daroussin]

Author: bapt
Date: Fri Dec 30 23:41:33 2016
New Revision: 310872
URL: https://svnweb.freebsd.org/changeset/base/310872

Log:
  Make sdiff --left-column work as expected
  
  MFC after:	3 days

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

Modified: head/usr.bin/sdiff/sdiff.c
==============================================================================
--- head/usr.bin/sdiff/sdiff.c	Fri Dec 30 23:14:18 2016	(r310871)
+++ head/usr.bin/sdiff/sdiff.c	Fri Dec 30 23:41:33 2016	(r310872)
@@ -87,7 +87,6 @@ enum {
 	UNIDIR_OPT,
 	STRIPCR_OPT,
 	HORIZ_OPT,
-	LEFTC_OPT,
 	SUPCL_OPT,
 	LF_OPT,
 	/* the following groupings must be in sequence */
@@ -109,7 +108,6 @@ enum {
 
 static struct option longopts[] = {
 	/* options only processed in sdiff */
-	{ "left-column",		no_argument,		NULL,	LEFTC_OPT },
 	{ "suppress-common-lines",	no_argument,		NULL,	's' },
 	{ "width",			required_argument,	NULL,	'w' },
 
@@ -129,6 +127,7 @@ static struct option longopts[] = {
 	{ "ignore-tab-expansion",	no_argument,		NULL,	'E' },
 	{ "ignore-matching-lines",	required_argument,	NULL,	'I' },
 	{ "ignore-case",		no_argument,		NULL,	'i' },
+	{ "left-column",		no_argument,		NULL,	'l' },
 	{ "expand-tabs",		no_argument,		NULL,	't' },
 	{ "speed-large-files",		no_argument,		NULL,	'H' },
 	{ "ignore-all-space",		no_argument,		NULL,	'W' },