Date: Wed, 27 Jun 2018 21:00:10 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r335738 - stable/11/usr.bin/cmp Message-ID: <201806272100.w5RL0A9F095651@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Wed Jun 27 21:00:09 2018 New Revision: 335738 URL: https://svnweb.freebsd.org/changeset/base/335738 Log: MFC r333157: cmp(1): Provide some long options These match GNU cmp(1) for compatibility where applicable. Future work might implement the -i option from GNU cmp(1) to express skip either in terms of both files or of the form "SKIP1:SKIP2" rather than specifying them as additional arguments to cmp(1). Modified: stable/11/usr.bin/cmp/cmp.1 stable/11/usr.bin/cmp/cmp.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/cmp/cmp.1 ============================================================================== --- stable/11/usr.bin/cmp/cmp.1 Wed Jun 27 20:55:49 2018 (r335737) +++ stable/11/usr.bin/cmp/cmp.1 Wed Jun 27 21:00:09 2018 (r335738) @@ -31,7 +31,7 @@ .\" @(#)cmp.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd November 18, 2013 +.Dd May 1, 2018 .Dt CMP 1 .Os .Sh NAME @@ -59,10 +59,10 @@ The following options are available: .Bl -tag -width indent .It Fl h Do not follow symbolic links. -.It Fl l +.It Fl l , Fl -verbose Print the byte number (decimal) and the differing byte values (octal) for each difference. -.It Fl s +.It Fl s , Fl -silent , Fl -quiet Print nothing for differing files; return exit status only. .It Fl x Modified: stable/11/usr.bin/cmp/cmp.c ============================================================================== --- stable/11/usr.bin/cmp/cmp.c Wed Jun 27 20:55:49 2018 (r335737) +++ stable/11/usr.bin/cmp/cmp.c Wed Jun 27 21:00:09 2018 (r335738) @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> #include <fcntl.h> +#include <getopt.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -57,6 +58,14 @@ __FBSDID("$FreeBSD$"); int lflag, sflag, xflag, zflag; +static const struct option long_opts[] = +{ + {"verbose", no_argument, NULL, 'l'}, + {"silent", no_argument, NULL, 's'}, + {"quiet", no_argument, NULL, 's'}, + {NULL, no_argument, NULL, 0} +}; + static void usage(void); int @@ -68,7 +77,7 @@ main(int argc, char *argv[]) const char *file1, *file2; oflag = O_RDONLY; - while ((ch = getopt(argc, argv, "hlsxz")) != -1) + while ((ch = getopt_long(argc, argv, "+hlsxz", long_opts, NULL)) != -1) switch (ch) { case 'h': /* Don't follow symlinks */ oflag |= O_NOFOLLOW;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806272100.w5RL0A9F095651>