Home
last modified time | relevance | path

Searched full:diff (Results 1 – 25 of 1058) sorted by relevance

12345678910>>...43

/freebsd/usr.bin/diff/tests/
H A Ddiff_test.sh30 diff "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
33 diff -e "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
36 diff -u -L input1 -L input2 "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
39 diff -n "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
42 diff -q "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input2.in"
45 diff -q "$(atf_get_srcdir)/input1.in" "$(atf_get_srcdir)/input1.in"
48 diff -i "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
51 diff -w "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
54 diff -b "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)/input_c2.in"
57diff --label input_c1.in --label input_c2.in -p "$(atf_get_srcdir)/input_c1.in" "$(atf_get_srcdir)…
[all …]
/freebsd/contrib/file/magic/Magdir/
H A Ddiff3 # $File: diff,v 1.21 2024/07/13 14:47:09 christos Exp $
4 # diff: file(1) magic for diff(1) output
7 # URL: https://en.wikipedia.org/wiki/Diff
8 # Reference: http://mark0.net/download/triddefs_xml.7z/defs/d/diff.trid.xml
9 # Note: called "diff output text" by TrID and
13 0 search/1 diff\040 diff output text
14 # diff output text (strength=40=40+0) after unified diff output (strength=131=38+93)
16 !:mime text/x-diff
18 !:ext diff/patch
20 #!:ext diff/patch/dif/pch
[all …]
/freebsd/usr.bin/patch/tests/
H A Dunified_patch_test.sh36 diff -u foo_start foo_full > foo_start2full.diff
37 diff -u foo_end foo_full > foo_end2full.diff
38 diff -u foo_middle foo_full > foo_mid2full.diff
42 "cat foo_start2full.diff | wc -l | tr -d '[:space:]'"
44 "cat foo_end2full.diff | wc -l | tr -d '[:space:]'"
46 "cat foo_mid2full.diff | wc -l | tr -d '[:space:]'"
49 atf_check -o ignore patch foo_start foo_start2full.diff \
51 atf_check -o ignore patch foo_end foo_end2full.diff \
53 atf_check -o ignore patch foo_middle foo_mid2full.diff \
57 atf_check -o ignore diff foo_start2full foo_full
[all …]
/freebsd/sys/contrib/openzfs/cmd/
H A Dzilstat.in89 diff = {}
419 global curr, diff
422 diff = copy.deepcopy(curr)
426 if not isinstance(diff[pool][objset][key], int):
431 diff[pool][objset][key] = 0
433 diff[pool][objset][key] \
449 global diff
450 for pool in diff:
451 for objset in diff[pool]:
452 diff[pool][objset]["pool"] = pool
[all …]
/freebsd/contrib/llvm-project/compiler-rt/lib/sanitizer_common/
H A Dsanitizer_allocator_size_class_map.h47 // c00 => s: 0 diff: +0 00% l 0 cached: 0 0; id 0
48 // c01 => s: 16 diff: +16 00% l 4 cached: 256 4096; id 1
49 // c02 => s: 32 diff: +16 100% l 5 cached: 256 8192; id 2
50 // c03 => s: 48 diff: +16 50% l 5 cached: 256 12288; id 3
51 // c04 => s: 64 diff: +16 33% l 6 cached: 256 16384; id 4
52 // c05 => s: 80 diff: +16 25% l 6 cached: 256 20480; id 5
53 // c06 => s: 96 diff: +16 20% l 6 cached: 256 24576; id 6
54 // c07 => s: 112 diff: +16 16% l 6 cached: 256 28672; id 7
56 // c08 => s: 128 diff: +16 14% l 7 cached: 256 32768; id 8
57 // c09 => s: 144 diff: +16 12% l 7 cached: 256 36864; id 9
[all …]
/freebsd/contrib/diff/
H A DAUTHORS26 Assigns diff (diff.c, initial version).
33 Assigns changes to diff.
36 Assigns changes to diff.
42 Assigns changes to GNU Diff.
45 Assigns changes to diff (for -D).
48 Disclaims changes by Thomas May to diff.
51 Disclaims changes to diff.
54 Disclaims changes by Wayne Davison to diff.
57 Disclaims changes to diff.
61 Disclaims changes to GNU Diff.
[all …]
H A DNEWS14 * diff now omits the ".000000000" on hosts that do not support
21 * Diff now simply prints "Files A and B differ" instead of "Binary
33 * New diff and sdiff option:
39 excluding files by name (diff -x and -X).
48 * cmp and diff now conform to POSIX 1003.1-2001 (IEEE Std 1003.1-2001)
51 for `diff -NUM', where NUM is a number. Use -C NUM or -U NUM instead.
60 * diff uses ISO 8601 style time stamps for output times (e.g. "2001-11-23
63 * diff's -I and -F options use the regexp syntax of grep, not of Emacs.
64 * diff now accepts multiple context arguments, and uses their maximum value.
65 * New diff and sdiff options:
[all …]
H A DChangeLog47 * doc/diff.texi (dircategory): Change to "Text creation and
51 (Binary): -q doesn't exactly cause diff to assume files are binary.
62 (diff Options): Add --strip-trailing-cr.
84 * src/analyze.c, src/context.c, src/diff.c, src/io.c, src/util.c:
85 Do not include regex.h, as diff.h does this now.
92 * src/diff.c (option_help_msgid): Likewise.
98 * src/diff.c (main): Likewise.
103 * src/diff.c (main): Likewise.
107 * src/diff.c: Include <exit.h>.
119 * src/diff.h: Include regex.h, unlocked-io.h.
[all …]
/freebsd/tools/tools/git/
H A Dgit-arc.sh87 specified commits. Currently only the diff is updated; the
94 <Make changes to the diff based on reviewer feedback.>
196 local diff
198 diff=$1
199 if ! expr "$diff" : 'D[1-9][0-9]*$' >/dev/null; then
200 err "invalid diff ID $diff"
203 echo '{"names":["'"$diff"'"]}' |
205 jq -r "select(.response != []) | .response.${diff}.phid"
210 local diff tmp status summary
212 diff=$1
[all …]
/freebsd/contrib/one-true-awk/testdir/
H A DT.clv15 diff foo1 foo2 || echo 'BAD: T.clv (stdin only)'
24 diff foo1 foo2 || echo 'BAD: T.clv (x=1 only)'
33 diff foo1 foo2 || echo 'BAD: T.clv (x=3 only)'
43 diff foo1 foo2 || echo 'BAD: T.clv (x=3 only)'
48 diff foo1 foo2 || echo 'BAD: T.clv (x=4 /dev/null)'
53 diff foo1 foo2 || echo 'BAD: T.clv (x=5 /dev/null)'
63 diff foo1 foo2 || echo 'BAD: T.clv (x=6 /dev/null)'
70 diff foo1 foo2 || echo 'BAD: T.clv (x=7 /dev/null)'
77 diff foo1 foo2 || echo 'BAD: T.clv (_=7A /dev/null)'
87 diff foo1 foo2 || echo 'BAD: T.clv (x=11)'
[all …]
H A DT.argv17 diff foo1 foo2 || echo 'BAD: T.argv (echo1 *)'
30 diff foo1 foo2 || echo 'BAD: T.argv (echo2 *)'
47 diff foo1 foo2 || echo 'BAD: T.argv (argc *)'
56 diff foo1 foo2 || echo 'BAD: T.argv (L=foo <foo1)'
65 diff foo1 foo2 || echo 'BAD: T.argv (L=foo foo1)'
74 diff foo1 foo2 || echo 'BAD: T.argv (L=foo -)'
86 diff foo1 foo2 || echo 'BAD: T.argv (L=foo L=glop)'
98 diff foo1 foo2 || echo 'BAD: T.argv (L=11 L=22)'
104 diff foo1 foo2 || echo 'BAD: T.argv assignment operand modified'
108 diff foo1 foo2 || echo 'BAD: T.argv (ARGV[1] + ARGV[2])'
[all …]
H A DT.split35 diff $TEMP1 $TEMP2 || fail 'BAD: T.split 0.1'
45 diff $TEMP1 $TEMP2 || fail 'BAD: T.split 0.2'
62 diff $TEMP1 $TEMP2 || fail 'BAD: T.split 0.3'
73 diff $TEMP1 $TEMP2 || fail 'BAD: T.split 0.4'
87 diff $TEMP1 $TEMP2 || fail 'BAD: T.split 0.5'
96 diff $TEMP1 $TEMP2 || fail 'BAD: T.split (record assignment 1)'
108 diff $TEMP1 $TEMP2 || fail 'BAD: T.split (record assignment 2)'
129 diff $TEMP0 $TEMP1 || fail 'BAD: T.split 1'
145 diff $TEMP0 $TEMP1 || fail 'BAD: T.split //'
159 diff $TEMP0 $TEMP2 || fail 'BAD: T.split 2'
[all …]
H A DT.redir6 diff foo /etc/passwd || echo 'BAD: T.redir (print >"foo")'
10 diff foo /etc/passwd || echo 'BAD: T.redir (print >>"foo")'
15 diff foo /etc/passwd || echo 'BAD: T.redir (print > and >>"foo")'
19 diff foo /etc/passwd || echo 'BAD: T.redir (print | "cat >foo")'
28 diff foo1 foo2 || echo 'BAD: T.redir (buffering)'
32 diff foo2 /etc/passwd || echo 'BAD: T.redir (print >"/dev/stderr")'
33 diff foo1 /dev/null || echo 'BAD: T.redir (print >"/dev/stderr")'
37 diff foo1 /etc/passwd || echo 'BAD: T.redir (print >"/dev/stdout")'
38 diff foo2 /dev/null || echo 'BAD: T.redir (print >"/dev/stderr")'
/freebsd/contrib/ntp/util/
H A Dprecision.c69 long diff; in default_get_resolution() local
77 diff = tp.tv_usec - last; in default_get_resolution()
78 if (diff < 0) diff += DUSECS; in default_get_resolution()
79 if (diff > MINSTEP) if (minsteps-- <= 0) break; in default_get_resolution()
84 diff, i, (i==1) ? "" : "s"); in default_get_resolution()
86 diff = (diff *3)/2; in default_get_resolution()
91 diff = 1; /* No STEP, so FAST machine */ in default_get_resolution()
96 diff = 1; /* time to read clock >= resolution */ in default_get_resolution()
98 for (i=0, val=HUSECS; val>0; i--, val >>= 1) if (diff >= val) return i; in default_get_resolution()
127 long diff; in default_get_precision() local
[all …]
/freebsd/contrib/diff/doc/
H A Ddiff.75 .Nm diff
14 .Xr diff
17 .Xr diff
21 .Em diff
25 .Xr diff
27 .Xr diff
54 .Xr diff
58 .Xr diff
64 .Xr diff
74 .Xr diff
[all …]
H A Ddiff.texi2 @comment $Id: diff.texi,v 1.25 2004/04/12 07:44:35 eggert Exp $
4 @setfilename diff.info
13 and documents the @acronym{GNU} @command{diff}, @command{diff3},
40 * cmp: (diff)Invoking cmp. Compare 2 files byte by byte.
41 * diff: (diff)Invoking diff. Compare 2 files line by line.
42 * diff3: (diff)Invoking diff3. Compare 3 files line by line.
43 * patch: (diff)Invoking patch. Apply a patch to a file.
44 * sdiff: (diff)Invoking sdiff. Merge 2 files side-by-side.
49 * Diff: (diff). Comparing and merging files.
79 * Adjusting Output:: Making @command{diff} output prettier.
[all …]
/freebsd/crypto/openssl/crypto/
H A Dalphacpuid.pl168 my ($diff,$lastdiff)=("\$21","\$22");
180 mov 0,$diff
184 addl $diff,$tick,$tick
185 mov $tick,$diff
187 stl $diff,0($out)
190 subq $tick,$lasttick,$diff
195 addl $diff,$tick,$tick
196 mov $tick,$diff
198 stl $diff,0($out)
215 mov 0,$diff
[all …]
H A Dppccpuid.pl211 my ($diff,$lastdiff)=("r8","r9");
220 li $diff,0
224 add $tick,$tick,$diff
229 sub $diff,$tick,$lasttick
233 add $tick,$tick,$diff
253 li $diff,0
257 add $tick,$tick,$diff
261 mftb $tick # collect 1st diff
262 sub $diff,$tick,$lasttick
264 mr $lastdiff,$diff
[all …]
/freebsd/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_diff/
H A Dzfs_diff_cliargs.ksh21 # 'zfs diff' should only work with supported options.
39 log_assert "'zfs diff' should only work with supported options."
56 log_must zfs diff $opt "$TESTSNAP1"
57 log_must zfs diff $opt "$TESTSNAP1" "$DATASET"
58 log_must zfs diff $opt "$TESTSNAP1" "$TESTSNAP2"
64 log_mustnot zfs diff $opt
65 log_mustnot zfs diff $opt "$DATASET"
66 log_mustnot zfs diff $opt "$DATASET@noexists"
67 log_mustnot zfs diff $opt "$DATASET" "$TESTSNAP1"
68 log_mustnot zfs diff $opt "$TESTSNAP2" "$TESTSNAP1"
[all …]
H A Dzfs_diff_mangle.ksh17 # 'zfs diff' escapes filenames as expected, 'zfs diff -h' doesn't
22 # 3. verify 'zfs diff' mangles them and 'zfs diff -h' doesn't
32 log_assert "'zfs diff' mangles filenames, 'zfs diff -h' doesn't"
45 log_must diff -u <(zfs diff -h "$TESTSNAP1" | grep -vF '<xattrdir>' | sort) "$MNTPOINT/śmieszny żup…
46 log_must diff -u <(zfs diff "$TESTSNAP1" | grep -vF '<xattrdir>' | sort) "$MNTPOINT/достопримеча…
48 log_pass "'zfs diff' mangles filenames, 'zfs diff -h' doesn't"
/freebsd/usr.bin/patch/
H A Dpatch.128 .Nd apply a diff file to an original
53 .Xr diff 1
61 will attempt to determine the type of the diff listing, unless overruled by a
81 to patch must be determined for each diff listing, and that the garbage before
82 each diff listing will be examined for interesting things such as file names
114 to interpret the patch file as a context diff.
157 the number of lines of context in the context diff, ordinarily 3.
195 to interpret the patch file as a normal diff.
254 option will not work with ed diff scripts because there is too little
264 (Note: this method cannot detect a reversed patch if it is a normal diff
[all …]
/freebsd/contrib/diff/src/
H A Ddiff3.c41 /* Different files within a three way diff. */
46 /* A three way diff is built from two two-way diffs; the file which
50 /* Different files within a two way diff.
61 ADD, /* Two way diff add */
62 CHANGE, /* Two way diff change */
63 DELETE, /* Two way diff delete */
70 /* Two way diff */
78 /* Three way diff */
81 enum diff_type correspond; /* Type of diff */
88 /* Access the ranges on a diff block. */
[all …]
/freebsd/contrib/ntp/libntp/
H A Dclocktime.c64 u_int32 diff[3]; /* abs difference to receive */ in clocktime() local
86 diff[0] = test[0] - rec_ui; in clocktime()
87 if (diff[0] >= 0x80000000u) in clocktime()
88 diff[0] = ~diff[0] + 1; in clocktime()
89 /* -- can't get closer if diff < NEARTIME */ in clocktime()
90 if (diff[0] < NEARTIME) { in clocktime()
92 return diff[0] < CLOSETIME; in clocktime()
113 diff[idx] = test[idx] - rec_ui; in clocktime()
114 if (diff[idx] >= 0x80000000u) in clocktime()
115 diff[idx] = ~diff[idx] + 1; in clocktime()
[all …]
/freebsd/usr.bin/diff/
H A Ddiff.11 .\" $OpenBSD: diff.1,v 1.47 2015/11/24 19:35:41 jmc Exp $
31 .Dt DIFF 1
34 .Nm diff
37 .Nm diff
70 .Nm diff
100 .Nm diff
128 .Nm diff
158 .Nm diff
201 .Nm diff
218 .Nm diff
[all...]
/freebsd/contrib/llvm-project/llvm/tools/llvm-tapi-diff/
H A DDiffEngine.cpp

12345678910>>...43