Commit Briefs

e51ebd83fa Stefan Sperling

handle binary files like diff(1) does; new -a option forces text

diff | patch | tree

29916bb6c0 Stefan Sperling

expose struct diff_atom in public API for external atomizer implementations

diff | patch | tree

fe6d58fb52 Christian Weisgerber

add a missing include for uint8_t and switch from <inttypes.h> to <stdint.h>

ok millert stsp

diff | patch | tree

ab378e1f5d Stefan Sperling

fix patience diff assertion failure exposed by test122

diff | patch | tree

d108549297 Stefan Sperling

add a test case which triggers an assertion in diff -P

diff | patch | tree

c285a1f8b9 Stefan Sperling

add another test case where a context line appears as both - and +

This line appears as a context line with regular diff(1) and git diff: crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; [[[ + crd->crd_alg = sd->mds.mdd_crypto.scr_alg; + crd->crd_klen = sd->mds.mdd_crypto.scr_klen; crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; - bcopy(&blk, crd->crd_iv, sizeof(blk)); + memcpy(crd->crd_iv, &blkno, sizeof(blkno)); ]]] Our diff produces a different result where this context line is both deleted and added: [[[ - crd->crd_alg = CRYPTO_AES_XTS; + crd->crd_alg = sd->mds.mdd_crypto.scr_alg; + crd->crd_klen = sd->mds.mdd_crypto.scr_klen; + crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; + memcpy(crd->crd_iv, &blkno, sizeof(blkno)); + } - switch (sd->mds.mdd_crypto.scr_meta->scm_alg) { - case SR_CRYPTOA_AES_XTS_128: - crd->crd_klen = 256; - break; - case SR_CRYPTOA_AES_XTS_256: - crd->crd_klen = 512; - break; - default: - goto unwind; - } - crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; - bcopy(&blk, crd->crd_iv, sizeof(blk)); - } - crwu->cr_wu = wu; - crwu->cr_crp->crp_opaque = crwu; - return (crwu); ]]]

diff | patch | tree

e8eedebc88 Stefan Sperling

add some API functions which allow access to opaque struct diff_chunk

diff | patch | tree

6715724815 Neels Hofmeyr

fix patience: off-by-one preventing swallow the same identical line twice

diff | patch | tree

ede78929be Neels Hofmeyr

results_test: fix output: print atom indexes, not file pos

diff | patch | tree

e638575c92 Neels Hofmeyr

assertions fixup: unused var for non-debug

diff | patch | tree

a94b722932 Stefan Sperling

include sys/types.h for size_t in our string.h compat header file

diff | patch | tree

7280e29c8e Neels Hofmeyr

remove a bunch of overly verbose debug

diff | patch | tree

f6db314590 Neels Hofmeyr

fix result chunks: add minus above plus failed to shift "empty" positions

diff | patch | tree

c672cd5263 Neels Hofmeyr

add test020

diff | patch | tree

486215cf28 Neels Hofmeyr

undup code to add result chunks

diff | patch | tree

4861c9da86 Neels Hofmeyr

add sanity assertions around adding result chunks

uncovers errors related to placing minus chunks above already added plus chunks.

diff | patch | tree

6303eedc56 Stefan Sperling

add strlcat and strlcpy compat functions for Linux

diff | patch | tree

6c6e6e508e Neels Hofmeyr

add test117

diff | patch | tree

ae2763e9e2 Neels Hofmeyr

fix patience crash: iron out overlapping identical-blocks on the right

diff | patch | tree

46093fc37f Neels Hofmeyr

remove stray blank line

diff | patch | tree

10ae3a6560 Neels Hofmeyr

patience debug

diff | patch | tree

a5de263314 Neels Hofmeyr

patience comments

diff | patch | tree

9f9e0ab43b Neels Hofmeyr

cosmetic: patience: use local var 'r' for right atom

diff | patch | tree

ca1af24580 Neels Hofmeyr

cosmetic: rename local var from 'r' to 'rc'

diff | patch | tree

f5a254cc6e Neels Hofmeyr

debug fix in diff_data_init_subsection

diff | patch | tree