Home
last modified time | relevance | path

Searched refs:sdiff (Results 1 – 16 of 16) sorted by relevance

/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 …]
/freebsd/usr.bin/sdiff/
H A DMakefile3 PROG= sdiff
4 SRCS= edit.c sdiff.c
6 MAN1= sdiff.1
/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()
/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 DAUTHORS90 diff3.c, getopt.c, getopt1.c, regex.c, sdiff.c, util.c, xmalloc.c;
H A DREADME3 This directory contains the GNU diff, diff3, sdiff, and cmp utilities.
/freebsd/tools/test/stress2/misc/
H A Dtmpfs28.sh50 cmp -s $exp $log || { s2=2; sdiff $exp $log; }
/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 …]
/freebsd/usr.bin/
H A DMakefile132 sdiff \
/freebsd/usr.sbin/crunch/examples/
H A Dreally-big.conf111 progs bc cpio diff diff3 gas gawk grep gzip sdiff sort tar
/freebsd/etc/mtree/
H A DBSD.tests.dist1188 sdiff
/freebsd/targets/pseudo/tests/
H A DMakefile.depend347 usr.bin/sdiff/tests \
/freebsd/targets/pseudo/userland/
H A DMakefile.depend318 usr.bin/sdiff \
/freebsd/
H A DObsoleteFiles.inc13126 OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff