d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When passingthrough from sdiff to diff the -H/--speed-large-files

Browse Source 
options rename it to the long version as GNU diff only support the long
version of the option not the short version
This commit is contained in:
Baptiste Daroussin 2017-04-08 08:41:05 +00:00
parent e53fbbe661
commit 85bb63bd29
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/sdiff/sdiff.1
View File

@ -4,7 +4,7 @@
.\" Written by Raymond Lai <ray@cyth.net>.
.\" Public domain.
.\"
.Dd $Mdocdate: July 5 2012 $
.Dd April 8, 2017
.Dt SDIFF 1
.Os
.Sh NAME
@ -12,7 +12,7 @@
.Nd side-by-side diff
.Sh SYNOPSIS
.Nm
.Op Fl abdilstW
.Op Fl abdilstHW
.Op Fl I Ar regexp
.Op Fl o Ar outfile
.Op Fl w Ar width

6
usr.bin/sdiff/sdiff.c
View File

@ -259,7 +259,6 @@ main(int argc, char **argv)
case 'E':
case 'i':
case 't':
case 'H':
case 'W':
for(popt = longopts; ch != popt->val && popt->name != NULL; popt++);
diffargv[1] = realloc(diffargv[1], sizeof(char) * strlen(diffargv[1]) + 2);
@ -271,6 +270,9 @@ main(int argc, char **argv)
else
sprintf(diffargv[1], "%s%c", diffargv[1], ch);
break;
case 'H':
diffargv[diffargc++] = "--speed-large-files";
break;
case DIFFPROG_OPT:
diffargv[0] = diffprog = optarg;
break;
@ -1151,7 +1153,7 @@ usage(void)
{
fprintf(stderr,
"usage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1"
"usage: sdiff [-abdilstHW] [-I regexp] [-o outfile] [-w width] file1"
" file2\n");
exit(2);
}