Home
last modified time | relevance | path

Searched full:sdiff (Results 1 – 25 of 42) sorted by relevance

12

/freebsd/usr.bin/sdiff/tests/
H A Dsdiff_test.sh36 sdiff -l "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
39 sdiff -s "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
42 sdiff -w 125 "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
55 atf_check -o file:$(atf_get_srcdir)/d_iflags_a1.out -s eq:1 sdiff ${tail1}
56 atf_check -o file:$(atf_get_srcdir)/d_iflags_a2.out -s eq:1 sdiff ${tail2}
57 atf_check -o file:$(atf_get_srcdir)/d_iflags_b1.out -s eq:1 sdiff -s ${tail1}
58 atf_check -o file:$(atf_get_srcdir)/d_iflags_b2.out -s eq:1 sdiff -s ${tail2}
59 atf_check -o file:$(atf_get_srcdir)/d_iflags_c1.out -s eq:1 sdiff -l ${tail1}
60 atf_check -o file:$(atf_get_srcdir)/d_iflags_c2.out -s eq:1 sdiff -l ${tail2}
61 atf_check -o file:$(atf_get_srcdir)/d_iflags_d1.out -s eq:1 sdiff -s ${tail1}
[all …]
/freebsd/contrib/netbsd-tests/usr.bin/sdiff/
H A Dt_sdiff.sh36 sdiff -l "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
39 sdiff -s "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
42 sdiff -w 125 "$(atf_get_srcdir)/d_input1" "$(atf_get_srcdir)/d_input2"
55 atf_check -o file:$(atf_get_srcdir)/d_iflags_a1.out -s eq:1 sdiff ${tail1}
56 atf_check -o file:$(atf_get_srcdir)/d_iflags_a2.out -s eq:1 sdiff ${tail2}
57 atf_check -o file:$(atf_get_srcdir)/d_iflags_b1.out -s eq:1 sdiff -s ${tail1}
58 atf_check -o file:$(atf_get_srcdir)/d_iflags_b2.out -s eq:1 sdiff -s ${tail2}
59 atf_check -o file:$(atf_get_srcdir)/d_iflags_c1.out -s eq:1 sdiff -l ${tail1}
60 atf_check -o file:$(atf_get_srcdir)/d_iflags_c2.out -s eq:1 sdiff -l ${tail2}
61 atf_check -o file:$(atf_get_srcdir)/d_iflags_d1.out -s eq:1 sdiff -s ${tail1}
[all …]
/illumos-gate/usr/src/man/man1/
H A Dsdiff.16 .TH SDIFF 1 "Feb 17, 2023"
8 sdiff \- print differences between two files side-by-side
11 \fBsdiff\fR [\fB-l\fR] [\fB-s\fR] [\fB-o\fR \fIoutput\fR] [\fB-w\fR \fIn\fR] \fIfilename1\fR \fIfil…
15 \fBsdiff\fR uses the output of the \fBdiff\fR command to produce a side-by-side
50 \fBsdiff\fR prompts the user with a \fB%\fR and waits for one of the following
148 See \fBlargefile\fR(7) for the description of the behavior of \fBsdiff\fR when
151 \fBExample 1 \fRAn example of the \fBsdiff\fR command.
154 A sample output of \fBsdiff\fR follows.
173 \fBsdiff\fR for each corresponding locale category is determined by the value
177 determines how \fBsdiff\fR behaves.
[all …]
/freebsd/contrib/diff/man/
H A Dsdiff.12 .TH SDIFF "1" "April 2004" "diffutils 2.8.7" "User Commands"
4 sdiff \- side-by-side merge of file differences
6 .B sdiff
81 .B sdiff
85 .B sdiff
/freebsd/contrib/diff/
H A DNEWS33 * New diff and sdiff option:
65 * New diff and sdiff options:
72 * New diff3 and sdiff option:
85 * The new sdiff interactive command `ed' precedes each version with a header.
107 * New cmp, diff, diff3, sdiff option: --help
170 - When signaled, sdiff exits with the signal's status, not with status 2.
193 * sdiff and diff -y handle incomplete lines.
198 * Add sdiff and cmp programs.
209 --sdiff-merge-assist
H A DChangeLog94 * src/sdiff.c (usage): Likewise.
100 * src/sdiff.c (main): Likewise.
105 * src/sdiff.c (main): Likewise.
149 * src/sdiff.c: Include <unlocked-io.h>, <exit.h>.
203 sdiff.$(OBJEXT)): Rename from (misspelled) diff3.$(OBJECT),
204 diff.$(OBJECT), sdiff.$(OBJECT). Patch by Paul D. Smith in
277 * src/diff.c, src/diff3.c, src/sdiff.c: Likewise.
280 * src/diff.h, src/diff3.c, src/sdiff.c: Likewise.
319 (Tabs, sdiff Option Summary, diff Options):
410 (cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT)): Depend
[all …]
H A DREADME3 This directory contains the GNU diff, diff3, sdiff, and cmp utilities.
H A DAUTHORS90 diff3.c, getopt.c, getopt1.c, regex.c, sdiff.c, util.c, xmalloc.c;
/freebsd/usr.bin/sdiff/
H A DMakefile3 PROG= sdiff
4 SRCS= edit.c sdiff.c
6 MAN= sdiff.1
H A Dsdiff.11 .\" $OpenBSD: sdiff.1,v 1.15 2007/06/29 14:48:07 jmc Exp $
10 .Nm sdiff
H A Dsdiff.c1 /* $OpenBSD: sdiff.c,v 1.36 2015/12/29 19:04:46 gsoares Exp $ */
90 /* options only processed in sdiff */
119 "usage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2\n",
176 if (asprintf(&target_file, "%s/sdiff.XXXXXXXXXX", tmpdir) == -1) in mktmpcpy()
338 * Create temporary files for diff and sdiff to share if file1 in main()
339 * or file2 are not regular files. This allows sdiff and diff in main()
457 * When sdiff detects a binary file as input.
823 * `(' divider. This matches GNU sdiff, but I in parsecmd()
1175 "usage: sdiff [-abdilstHW] [-I regexp] [-o outfile] [-w width] file1" in usage()
/freebsd/contrib/diff/src/
H A Dside.c1 /* sdiff-format output routines for GNU DIFF.
31 /* Print the edit-script SCRIPT as a sdiff style output. */
64 /* Print the text for half an sdiff line. This means truncate to
230 /* Print a hunk of an sdiff diff.
H A Ddiff.h78 /* Output sdiff style (-y). */
172 /* If using OUTPUT_SDIFF print extra information to help the sdiff filter. */
H A Dsdiff.c1 /* sdiff - side-by-side merge of file differences
524 version_etc (stdout, "sdiff", PACKAGE_NAME, PACKAGE_VERSION, in main()
602 diffarg ("--sdiff-merge-assist"); in main()
1204 file's name. Use the prefix "sdiff". */
/freebsd/tools/regression/p1003_1b/
H A Dfifo.c74 long sdiff; in tvsub() local
77 sdiff = a->tv_sec - b->tv_sec; in tvsub()
80 return (double)(sdiff * 1000000 + udiff) / 1e6; in tvsub()
/illumos-gate/usr/src/lib/libc/port/gen/
H A Dgetvfsent.c58 #define SDIFF(xx, typem, typer)\ macro
156 (bstat == 1 && SDIFF(vfs_special, bmode, brdev)) || in getvfsany()
158 (cstat == 1 && SDIFF(vfs_fsckdev, cmode, crdev)) || in getvfsany()
H A Dgetmntent.c60 #define SDIFF(xx, typem, typer)\ macro
130 (bstat == 1 && SDIFF(mnt_special, bmode, brdev)) || in getmntany_compat()
/freebsd/contrib/diff/doc/
H A Ddiff.texi14 @command{sdiff}, and @command{cmp} commands for showing the
44 * sdiff: (diff)Invoking sdiff. Merge 2 files side-by-side.
85 * Interactive Merging:: Interactive merging with @command{sdiff}.
94 * Invoking sdiff:: Side-by-side merge of file differences.
133 You can use the @command{sdiff} command to merge two files interactively.
177 @command{sdiff} was written by Thomas Lord. @acronym{GNU} @command{cmp}
1002 You can use the @command{sdiff} command to interactively merge side by side
2393 @chapter Interactive Merging with @command{sdiff}
2397 With @command{sdiff}, you can merge two files interactively based on a
2400 put the merged text. @xref{Invoking sdiff}, for more details on the
[all …]
H A Ddiff.750 .Xr sdiff
102 .Xr sdiff
1073 .Xr sdiff
2950 .Sh Interactive Merging with Xr sdiff
2952 .Xr sdiff ,
2962 .Dq Invoking sdiff ,
2964 .Xr sdiff .
2971 .Ss Specifying Xr diff Options to Xr sdiff
2973 .Xr sdiff
2993 .Xr sdiff
[all …]
/illumos-gate/usr/src/lib/libpctx/common/
H A Dlibpctx.c504 time_t sdiff = tva->tv_sec - tvb->tv_sec; in msdiff() local
507 if (sdiff < 0) in msdiff()
511 sdiff--; in msdiff()
513 if (sdiff < 0) in msdiff()
515 if (sdiff >= (INT_MAX / MILLISEC)) in msdiff()
517 return ((uint_t)(sdiff * MILLISEC + udiff / MILLISEC)); in msdiff()
/illumos-gate/usr/src/cmd/
H A DMakefile374 sdiff \
696 sdiff \
/illumos-gate/usr/src/cmd/sdiff/
H A DMakefile26 PROG= sdiff
H A Dsdiff.c32 * sdiff [-l] [-s] [-w #] [-o output] file1 file2
201 "Usage: sdiff [-l] [-s] [-o output] [-w #] file1 file2\n")); in main()
611 (void) fprintf(stderr, "sdiff: "); in error()
/freebsd/tools/test/stress2/misc/
H A Dtmpfs28.sh50 cmp -s $exp $log || { s2=2; sdiff $exp $log; }
H A Dseekhole2.sh53 sdiff -s $exp $log || s2=1

12