git: world - Replace gnu diff, diff3, and sdiff with BSD versions
Matthew Dillon
dillon at crater.dragonflybsd.org
Mon Oct 14 09:01:29 PDT 2024
commit c9733229451fac5faa53b1a016b01866eae75a1c
Author: Matthew Dillon <dillon at apollo.backplane.com>
Date: Tue Oct 8 16:18:45 2024 -0700
world - Replace gnu diff, diff3, and sdiff with BSD versions
* Replace diff and diff3 with the OpenBSD diff and diff3,
Replace sdiff with the FreeBSD sdiff,
Remove the GNU diff, diff3, and sdiff
* Basic testing with dsynth bulk to ensure no significant compatibility
disruptions.
Submitted-by: Tyler <tyler.clark at foxide.xyz>
Summary of changes:
contrib/diffutils/COPYING | 674 ---
contrib/diffutils/README | 64 -
contrib/diffutils/README.DELETED | 154 -
contrib/diffutils/README.DRAGONFLY | 16 -
contrib/diffutils/doc/diffutils.info | 5314 --------------------
contrib/diffutils/lib/allocator.c | 5 -
contrib/diffutils/lib/allocator.h | 58 -
contrib/diffutils/lib/anytostr.c | 57 -
contrib/diffutils/lib/areadlink.c | 56 -
contrib/diffutils/lib/areadlink.h | 33 -
contrib/diffutils/lib/argmatch.c | 275 --
contrib/diffutils/lib/argmatch.h | 111 -
contrib/diffutils/lib/asnprintf.c | 34 -
contrib/diffutils/lib/assure.h | 37 -
contrib/diffutils/lib/basename-lgpl.c | 75 -
contrib/diffutils/lib/basename.c | 58 -
contrib/diffutils/lib/binary-io.c | 37 -
contrib/diffutils/lib/binary-io.h | 81 -
contrib/diffutils/lib/bitrotate.c | 3 -
contrib/diffutils/lib/bitrotate.h | 136 -
contrib/diffutils/lib/c-ctype.c | 3 -
contrib/diffutils/lib/c-ctype.h | 366 --
contrib/diffutils/lib/c-stack.c | 334 --
contrib/diffutils/lib/c-stack.h | 44 -
contrib/diffutils/lib/c-strcase.h | 56 -
contrib/diffutils/lib/c-strcasecmp.c | 56 -
contrib/diffutils/lib/c-strcaseeq.h | 181 -
contrib/diffutils/lib/c-strncasecmp.c | 56 -
contrib/diffutils/lib/careadlinkat.c | 160 -
contrib/diffutils/lib/careadlinkat.h | 67 -
contrib/diffutils/lib/cdefs.h | 514 --
contrib/diffutils/lib/cloexec.c | 83 -
contrib/diffutils/lib/cloexec.h | 38 -
contrib/diffutils/lib/cmpbuf.c | 109 -
contrib/diffutils/lib/cmpbuf.h | 19 -
contrib/diffutils/lib/diffseq.h | 529 --
contrib/diffutils/lib/dirname-lgpl.c | 86 -
contrib/diffutils/lib/dirname.c | 38 -
contrib/diffutils/lib/dirname.h | 54 -
contrib/diffutils/lib/dosname.h | 52 -
contrib/diffutils/lib/dup2.c | 235 -
contrib/diffutils/lib/error.c | 411 --
contrib/diffutils/lib/error.h | 75 -
contrib/diffutils/lib/exclude.c | 695 ---
contrib/diffutils/lib/exclude.h | 62 -
contrib/diffutils/lib/exitfail.c | 24 -
contrib/diffutils/lib/exitfail.h | 18 -
contrib/diffutils/lib/fcntl.c | 626 ---
contrib/diffutils/lib/fd-hook.c | 116 -
contrib/diffutils/lib/fd-hook.h | 119 -
contrib/diffutils/lib/file-type.c | 111 -
contrib/diffutils/lib/file-type.h | 29 -
contrib/diffutils/lib/filename.h | 54 -
contrib/diffutils/lib/filenamecat-lgpl.c | 87 -
contrib/diffutils/lib/filenamecat.c | 41 -
contrib/diffutils/lib/filenamecat.h | 27 -
contrib/diffutils/lib/flexmember.h | 45 -
contrib/diffutils/lib/float+.h | 147 -
contrib/diffutils/lib/fnmatch.c | 356 --
contrib/diffutils/lib/fnmatch_loop.c | 1217 -----
contrib/diffutils/lib/freopen-safer.c | 111 -
contrib/diffutils/lib/freopen.c | 92 -
contrib/diffutils/lib/getopt-core.h | 96 -
contrib/diffutils/lib/getopt-ext.h | 77 -
contrib/diffutils/lib/getopt-pfx-core.h | 59 -
contrib/diffutils/lib/getopt-pfx-ext.h | 71 -
contrib/diffutils/lib/getopt.c | 811 ----
contrib/diffutils/lib/getopt1.c | 159 -
contrib/diffutils/lib/getopt_int.h | 118 -
contrib/diffutils/lib/getprogname.c | 255 -
contrib/diffutils/lib/getprogname.h | 40 -
contrib/diffutils/lib/gettext.h | 294 --
contrib/diffutils/lib/gettime.c | 49 -
contrib/diffutils/lib/hard-locale.c | 72 -
contrib/diffutils/lib/hard-locale.h | 25 -
contrib/diffutils/lib/hash.c | 1225 -----
contrib/diffutils/lib/hash.h | 103 -
contrib/diffutils/lib/ignore-value.h | 50 -
contrib/diffutils/lib/imaxtostr.c | 3 -
contrib/diffutils/lib/intprops.h | 455 --
contrib/diffutils/lib/inttostr.c | 3 -
contrib/diffutils/lib/inttostr.h | 46 -
contrib/diffutils/lib/libc-config.h | 174 -
contrib/diffutils/lib/localcharset.c | 996 ----
contrib/diffutils/lib/localcharset.h | 134 -
contrib/diffutils/lib/localtime-buffer.c | 60 -
contrib/diffutils/lib/localtime-buffer.h | 27 -
contrib/diffutils/lib/malloca.c | 105 -
contrib/diffutils/lib/malloca.h | 127 -
contrib/diffutils/lib/mbchar.c | 37 -
contrib/diffutils/lib/mbchar.h | 360 --
contrib/diffutils/lib/mbiter.c | 3 -
contrib/diffutils/lib/mbiter.h | 225 -
contrib/diffutils/lib/mbscasecmp.c | 98 -
contrib/diffutils/lib/mbslen.c | 44 -
contrib/diffutils/lib/mbsstr.c | 384 --
contrib/diffutils/lib/mbuiter.c | 3 -
contrib/diffutils/lib/mbuiter.h | 232 -
contrib/diffutils/lib/minmax.h | 60 -
contrib/diffutils/lib/mktime-internal.h | 53 -
contrib/diffutils/lib/mktime.c | 549 ---
contrib/diffutils/lib/msvc-inval.h | 222 -
contrib/diffutils/lib/msvc-nothrow.h | 43 -
contrib/diffutils/lib/nstrftime.c | 1502 ------
contrib/diffutils/lib/offtostr.c | 3 -
contrib/diffutils/lib/prepargs.c | 91 -
contrib/diffutils/lib/prepargs.h | 3 -
contrib/diffutils/lib/printf-args.c | 187 -
contrib/diffutils/lib/printf-args.h | 158 -
contrib/diffutils/lib/printf-parse.c | 638 ---
contrib/diffutils/lib/printf-parse.h | 193 -
contrib/diffutils/lib/progname.c | 92 -
contrib/diffutils/lib/progname.h | 62 -
contrib/diffutils/lib/propername.c | 318 --
contrib/diffutils/lib/propername.h | 106 -
contrib/diffutils/lib/quote.h | 46 -
contrib/diffutils/lib/quotearg.c | 1089 -----
contrib/diffutils/lib/quotearg.h | 425 --
contrib/diffutils/lib/rawmemchr.c | 136 -
contrib/diffutils/lib/regcomp.c | 3946 ---------------
contrib/diffutils/lib/regex.c | 81 -
contrib/diffutils/lib/regex.h | 658 ---
contrib/diffutils/lib/regex_internal.c | 1746 -------
contrib/diffutils/lib/regex_internal.h | 896 ----
contrib/diffutils/lib/regexec.c | 4334 -----------------
contrib/diffutils/lib/sh-quote.c | 107 -
contrib/diffutils/lib/sh-quote.h | 49 -
contrib/diffutils/lib/sig-handler.c | 3 -
contrib/diffutils/lib/sig-handler.h | 51 -
contrib/diffutils/lib/stat-macros.h | 3 -
contrib/diffutils/lib/stat-time.c | 3 -
contrib/diffutils/lib/stat-time.h | 252 -
contrib/diffutils/lib/stdio--.h | 41 -
contrib/diffutils/lib/stdio-safer.h | 36 -
contrib/diffutils/lib/str-kmp.h | 153 -
contrib/diffutils/lib/streq.h | 176 -
contrib/diffutils/lib/strerror-override.c | 302 --
contrib/diffutils/lib/strerror-override.h | 56 -
contrib/diffutils/lib/strerror.c | 71 -
contrib/diffutils/lib/strftime.h | 33 -
contrib/diffutils/lib/striconv.c | 463 --
contrib/diffutils/lib/striconv.h | 75 -
contrib/diffutils/lib/stripslash.c | 45 -
contrib/diffutils/lib/strnlen1.c | 35 -
contrib/diffutils/lib/strnlen1.h | 40 -
contrib/diffutils/lib/system-quote.c | 311 --
contrib/diffutils/lib/system-quote.h | 99 -
contrib/diffutils/lib/tempname.c | 323 --
contrib/diffutils/lib/tempname.h | 65 -
contrib/diffutils/lib/time-internal.h | 49 -
contrib/diffutils/lib/time_rz.c | 344 --
contrib/diffutils/lib/timegm.c | 34 -
contrib/diffutils/lib/timespec.c | 3 -
contrib/diffutils/lib/timespec.h | 136 -
contrib/diffutils/lib/trim.c | 129 -
contrib/diffutils/lib/trim.h | 33 -
contrib/diffutils/lib/uinttostr.c | 3 -
contrib/diffutils/lib/umaxtostr.c | 3 -
contrib/diffutils/lib/unistd.c | 4 -
contrib/diffutils/lib/unistr/u8-mbtoucr.c | 142 -
contrib/diffutils/lib/unistr/u8-uctomb-aux.c | 66 -
contrib/diffutils/lib/unistr/u8-uctomb.c | 75 -
contrib/diffutils/lib/uniwidth/cjk.h | 37 -
contrib/diffutils/lib/uniwidth/width.c | 468 --
contrib/diffutils/lib/unlocked-io.h | 136 -
contrib/diffutils/lib/vasnprintf.c | 5621 ----------------------
contrib/diffutils/lib/vasnprintf.h | 79 -
contrib/diffutils/lib/verify.h | 285 --
contrib/diffutils/lib/version-etc-fsf.c | 30 -
contrib/diffutils/lib/version-etc.c | 258 -
contrib/diffutils/lib/version-etc.h | 78 -
contrib/diffutils/lib/wctype-h.c | 4 -
contrib/diffutils/lib/xalloc-die.c | 41 -
contrib/diffutils/lib/xalloc-oversized.h | 60 -
contrib/diffutils/lib/xalloc.h | 262 -
contrib/diffutils/lib/xasprintf.c | 34 -
contrib/diffutils/lib/xfreopen.c | 42 -
contrib/diffutils/lib/xfreopen.h | 2 -
contrib/diffutils/lib/xmalloc.c | 122 -
contrib/diffutils/lib/xreadlink.c | 44 -
contrib/diffutils/lib/xreadlink.h | 25 -
contrib/diffutils/lib/xsize.c | 3 -
contrib/diffutils/lib/xsize.h | 117 -
contrib/diffutils/lib/xstriconv.c | 62 -
contrib/diffutils/lib/xstriconv.h | 78 -
contrib/diffutils/lib/xstrndup.c | 36 -
contrib/diffutils/lib/xstrndup.h | 23 -
contrib/diffutils/lib/xstrtol-error.c | 98 -
contrib/diffutils/lib/xstrtol.c | 237 -
contrib/diffutils/lib/xstrtol.h | 73 -
contrib/diffutils/lib/xstrtoul.c | 6 -
contrib/diffutils/lib/xstrtoumax.c | 6 -
contrib/diffutils/lib/xvasprintf.c | 110 -
contrib/diffutils/lib/xvasprintf.h | 55 -
contrib/diffutils/man/diff.1 | 266 -
contrib/diffutils/man/diff3.1 | 100 -
contrib/diffutils/man/sdiff.1 | 102 -
contrib/diffutils/src/analyze.c | 716 ---
contrib/diffutils/src/context.c | 530 --
contrib/diffutils/src/die.h | 31 -
contrib/diffutils/src/diff.c | 1475 ------
contrib/diffutils/src/diff.h | 423 --
contrib/diffutils/src/diff3.c | 1789 -------
contrib/diffutils/src/dir.c | 385 --
contrib/diffutils/src/ed.c | 177 -
contrib/diffutils/src/ifdef.c | 431 --
contrib/diffutils/src/io.c | 821 ----
contrib/diffutils/src/normal.c | 87 -
contrib/diffutils/src/sdiff.c | 1172 -----
contrib/diffutils/src/side.c | 335 --
contrib/diffutils/src/system.h | 240 -
contrib/diffutils/src/util.c | 1576 ------
gnu/usr.bin/Makefile | 2 +-
gnu/usr.bin/diff/Makefile | 3 -
gnu/usr.bin/diff/Makefile.inc | 1 -
gnu/usr.bin/diff/Makefile.inc0 | 14 -
gnu/usr.bin/diff/diff/Makefile | 19 -
gnu/usr.bin/diff/diff/paths.h | 2 -
gnu/usr.bin/diff/diff/system.h | 240 -
gnu/usr.bin/diff/diff3/Makefile | 8 -
gnu/usr.bin/diff/libdiffutils/Makefile | 114 -
gnu/usr.bin/diff/libdiffutils/alloca.h | 66 -
gnu/usr.bin/diff/libdiffutils/arg-nonnull.h | 26 -
gnu/usr.bin/diff/libdiffutils/config.h | 1734 -------
gnu/usr.bin/diff/libdiffutils/fcntl.h | 840 ----
gnu/usr.bin/diff/libdiffutils/fnmatch.h | 584 ---
gnu/usr.bin/diff/libdiffutils/getopt-cdefs.h | 68 -
gnu/usr.bin/diff/libdiffutils/getopt.h | 88 -
gnu/usr.bin/diff/libdiffutils/string.h | 1537 ------
gnu/usr.bin/diff/libdiffutils/strings.h | 596 ---
gnu/usr.bin/diff/libdiffutils/sys/stat.h | 1290 -----
gnu/usr.bin/diff/libdiffutils/time.h | 824 ----
gnu/usr.bin/diff/libdiffutils/unistr.h | 747 ---
gnu/usr.bin/diff/libdiffutils/unitypes.h | 47 -
gnu/usr.bin/diff/libdiffutils/uniwidth.h | 73 -
gnu/usr.bin/diff/libdiffutils/unused-parameter.h | 36 -
gnu/usr.bin/diff/libdiffutils/warn-on-use.h | 131 -
gnu/usr.bin/diff/libver/Makefile | 11 -
gnu/usr.bin/diff/libver/version.c | 2 -
gnu/usr.bin/diff/libver/version.h | 1 -
gnu/usr.bin/diff/sdiff/Makefile | 8 -
initrd/rescue/Makefile | 16 +-
libexec/Makefile | 1 +
libexec/diff3prog/Makefile | 7 +
libexec/diff3prog/diff3prog.c | 624 +++
usr.bin/Makefile | 3 +
usr.bin/diff/Makefile | 7 +
usr.bin/diff/diff.1 | 475 ++
usr.bin/diff/diff.c | 402 ++
usr.bin/diff/diff.h | 95 +
usr.bin/diff/diffdir.c | 237 +
usr.bin/diff/diffreg.c | 1488 ++++++
{crypto/openssh => usr.bin/diff}/xmalloc.c | 63 +-
{crypto/openssh => usr.bin/diff}/xmalloc.h | 13 +-
usr.bin/diff3/Makefile | 9 +
usr.bin/diff3/diff3 | 64 +
usr.bin/diff3/diff3.1 | 201 +
usr.bin/sdiff/Makefile | 10 +
usr.bin/sdiff/Makefile.depend | 15 +
usr.bin/sdiff/edit.c | 208 +
usr.bin/sdiff/extern.h | 11 +
usr.bin/sdiff/sdiff.1 | 169 +
usr.bin/sdiff/sdiff.c | 1178 +++++
263 files changed, 5236 insertions(+), 71651 deletions(-)
create mode 100644 libexec/diff3prog/Makefile
create mode 100644 libexec/diff3prog/diff3prog.c
create mode 100644 usr.bin/diff/Makefile
create mode 100644 usr.bin/diff/diff.1
create mode 100644 usr.bin/diff/diff.c
create mode 100644 usr.bin/diff/diff.h
create mode 100644 usr.bin/diff/diffdir.c
create mode 100644 usr.bin/diff/diffreg.c
copy {crypto/openssh => usr.bin/diff}/xmalloc.c (53%)
copy {crypto/openssh => usr.bin/diff}/xmalloc.h (74%)
create mode 100644 usr.bin/diff3/Makefile
create mode 100644 usr.bin/diff3/diff3
create mode 100644 usr.bin/diff3/diff3.1
create mode 100644 usr.bin/sdiff/Makefile
create mode 100644 usr.bin/sdiff/Makefile.depend
create mode 100644 usr.bin/sdiff/edit.c
create mode 100644 usr.bin/sdiff/extern.h
create mode 100644 usr.bin/sdiff/sdiff.1
create mode 100644 usr.bin/sdiff/sdiff.c
http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/c9733229451fac5faa53b1a016b01866eae75a1c
--
DragonFly BSD source repository
More information about the Commits
mailing list