Author: bapt
Date: Mon Jan 2 11:58:54 2017
New Revision: 311098
URL: https://svnweb.freebsd.org/changeset/base/311098
Log:
MFC r310872, r310874
r310872:
Make sdiff --left-column work as expected
r310874:
Remove extra entries from the option enum
Modified:
stable/11/usr.bin/sdiff/sdiff.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.bin/sdiff/sdiff.c
==============================================================================
--- stable/11/usr.bin/sdiff/sdiff.c Mon Jan 2 10:16:41 2017
(r311097)
+++ stable/11/usr.bin/sdiff/sdiff.c Mon Jan 2 11:58:54 2017
(r311098)
@@ -83,34 +83,13 @@ enum {
NORMAL_OPT,
FCASE_SENSITIVE_OPT,
FCASE_IGNORE_OPT,
- FROMFILE_OPT,
- TOFILE_OPT,
- UNIDIR_OPT,
STRIPCR_OPT,
- HORIZ_OPT,
- LEFTC_OPT,
- SUPCL_OPT,
- LF_OPT,
- /* the following groupings must be in sequence */
- OLDGF_OPT,
- NEWGF_OPT,
- UNCGF_OPT,
- CHGF_OPT,
- OLDLF_OPT,
- NEWLF_OPT,
- UNCLF_OPT,
- /* end order-sensitive enums */
TSIZE_OPT,
- HLINES_OPT,
- LFILES_OPT,
DIFFPROG_OPT,
-
- NOOP_OPT,
};
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' },
@@ -130,6 +109,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' },
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
