From owner-svn-src-stable-11@freebsd.org Mon Jan 2 11:58:56 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 136BEC9B283; Mon, 2 Jan 2017 11:58:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6D03129B; Mon, 2 Jan 2017 11:58:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v02BwtAJ066519; Mon, 2 Jan 2017 11:58:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v02Bwtc4066518; Mon, 2 Jan 2017 11:58:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201701021158.v02Bwtc4066518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 2 Jan 2017 11:58:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r311098 - stable/11/usr.bin/sdiff X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2017 11:58:56 -0000 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' },