git: vendor/DIFFUTILS vendor/diffutils: upgrade from 3.3 to 3.7

Daniel Fojt deef at crater.dragonflybsd.org
Thu Jun 11 06:55:39 PDT 2020


commit 6ea1f93e6f10fea69952ac2c2c3720139429929b
Author: Daniel Fojt <df at neosystem.org>
Date:   Wed Jun 10 11:05:53 2020 +0200

    vendor/diffutils: upgrade from 3.3 to 3.7
    
    Summary of notable changes:
    
    - new options --color and --palette to generate and configure colored
      output, compatible with less -R
    - when binary files differ, diff now exits with status 1 as POSIX requires
    - unless the --ignore-file-name-case option is used, diff now
      considers file names to be equal only if they are byte-for-byte
      equivalent
    - diff -B no longer generates incorrect output if the two inputs each end
      with a one-byte incomplete line
    - diff --brief no longer reports a difference for unusual identical files
    - diff3 no longer malfunctions due to use-after-free
    - using an invalid regular expression with --ignore-matching-lines=RE (-I)
      no longer causes stack overflow
    - possible uninitialized memory read with --strip-trailing-cr fixed
    - default algorithm has been adjusted to output higher-quality results,
      and further tweaked to deal better with larger files
    
    For a complete history of changes see:
    
    http://git.savannah.gnu.org/cgit/diffutils.git/log/

Summary of changes:
 contrib/diffutils/README                           |    6 +-
 contrib/diffutils/doc/diffutils.info               | 4132 ++++++++++----------
 contrib/diffutils/lib/allocator.h                  |    6 +-
 contrib/diffutils/lib/anytostr.c                   |    6 +-
 contrib/diffutils/lib/areadlink.c                  |    4 +-
 contrib/diffutils/lib/areadlink.h                  |    4 +-
 contrib/diffutils/lib/argmatch.c                   |  275 ++
 contrib/diffutils/lib/argmatch.h                   |  111 +
 contrib/diffutils/lib/asnprintf.c                  |    4 +-
 contrib/diffutils/lib/{stdio--.h => assure.h}      |   34 +-
 contrib/diffutils/lib/basename-lgpl.c              |    4 +-
 contrib/diffutils/lib/basename.c                   |    4 +-
 contrib/diffutils/lib/binary-io.c                  |   34 +
 contrib/diffutils/lib/binary-io.h                  |   47 +-
 contrib/diffutils/lib/bitrotate.h                  |    7 +-
 contrib/diffutils/lib/c-ctype.c                    |  394 +-
 contrib/diffutils/lib/c-ctype.h                    |  454 ++-
 contrib/diffutils/lib/c-stack.c                    |   14 +-
 contrib/diffutils/lib/c-stack.h                    |    4 +-
 contrib/diffutils/lib/c-strcase.h                  |    4 +-
 contrib/diffutils/lib/c-strcasecmp.c               |    4 +-
 contrib/diffutils/lib/c-strcaseeq.h                |    7 +-
 contrib/diffutils/lib/c-strncasecmp.c              |    4 +-
 contrib/diffutils/lib/careadlinkat.c               |    4 +-
 contrib/diffutils/lib/careadlinkat.h               |    4 +-
 contrib/diffutils/lib/cdefs.h                      |  514 +++
 contrib/diffutils/lib/cloexec.c                    |   83 +
 contrib/diffutils/lib/cloexec.h                    |   38 +
 contrib/diffutils/lib/cmpbuf.c                     |    4 +-
 contrib/diffutils/lib/cmpbuf.h                     |    2 +-
 contrib/diffutils/lib/diffseq.h                    |   38 +-
 contrib/diffutils/lib/dirname-lgpl.c               |    4 +-
 contrib/diffutils/lib/dirname.c                    |    4 +-
 contrib/diffutils/lib/dirname.h                    |   14 +-
 contrib/diffutils/lib/dosname.h                    |    9 +-
 contrib/diffutils/lib/dup2.c                       |  235 ++
 contrib/diffutils/lib/error.c                      |   60 +-
 contrib/diffutils/lib/error.h                      |   18 +-
 contrib/diffutils/lib/exclude.c                    |  190 +-
 contrib/diffutils/lib/exclude.h                    |   18 +-
 contrib/diffutils/lib/exitfail.c                   |    4 +-
 contrib/diffutils/lib/exitfail.h                   |    4 +-
 contrib/diffutils/lib/fcntl.c                      |  626 +++
 contrib/diffutils/lib/fd-hook.c                    |  116 +
 contrib/diffutils/lib/fd-hook.h                    |    6 +-
 contrib/diffutils/lib/file-type.c                  |   66 +-
 contrib/diffutils/lib/file-type.h                  |    4 +-
 contrib/diffutils/lib/filename.h                   |   54 +
 contrib/diffutils/lib/filenamecat-lgpl.c           |   61 +-
 contrib/diffutils/lib/filenamecat.c                |    8 +-
 contrib/diffutils/lib/filenamecat.h                |    4 +-
 contrib/diffutils/lib/flexmember.h                 |   45 +
 contrib/diffutils/lib/float+.h                     |    4 +-
 contrib/diffutils/lib/fnmatch.c                    |   18 +-
 contrib/diffutils/lib/fnmatch_loop.c               |   20 +-
 contrib/diffutils/lib/freopen-safer.c              |   18 +-
 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                     | 1440 +++----
 contrib/diffutils/lib/getopt1.c                    |  179 +-
 contrib/diffutils/lib/getopt_int.h                 |   91 +-
 contrib/diffutils/lib/getprogname.c                |  255 ++
 .../diffutils/lib/{stdio-safer.h => getprogname.h} |   32 +-
 contrib/diffutils/lib/gettext.h                    |   20 +-
 contrib/diffutils/lib/gettime.c                    |   33 +-
 contrib/diffutils/lib/hard-locale.c                |    4 +-
 contrib/diffutils/lib/hard-locale.h                |    4 +-
 contrib/diffutils/lib/hash.c                       |   12 +-
 contrib/diffutils/lib/hash.h                       |    8 +-
 contrib/diffutils/lib/ignore-value.h               |   29 +-
 contrib/diffutils/lib/intprops.h                   |  280 +-
 contrib/diffutils/lib/inttostr.h                   |    4 +-
 contrib/diffutils/lib/libc-config.h                |  174 +
 contrib/diffutils/lib/localcharset.c               | 1105 ++++--
 contrib/diffutils/lib/localcharset.h               |  100 +-
 contrib/diffutils/lib/localtime-buffer.c           |   60 +
 .../lib/{asnprintf.c => localtime-buffer.h}        |   29 +-
 contrib/diffutils/lib/malloca.c                    |  131 +-
 contrib/diffutils/lib/malloca.h                    |   30 +-
 contrib/diffutils/lib/mbchar.c                     |    4 +-
 contrib/diffutils/lib/mbchar.h                     |    7 +-
 contrib/diffutils/lib/mbiter.h                     |    7 +-
 contrib/diffutils/lib/mbscasecmp.c                 |    4 +-
 contrib/diffutils/lib/mbslen.c                     |    4 +-
 contrib/diffutils/lib/mbsstr.c                     |   16 +-
 contrib/diffutils/lib/mbuiter.h                    |    7 +-
 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                 |    8 +-
 contrib/diffutils/lib/msvc-nothrow.h               |    6 +-
 contrib/diffutils/lib/{strftime.c => nstrftime.c}  |  337 +-
 contrib/diffutils/lib/prepargs.c                   |    3 +-
 contrib/diffutils/lib/printf-args.c                |    4 +-
 contrib/diffutils/lib/printf-args.h                |    4 +-
 contrib/diffutils/lib/printf-parse.c               |    6 +-
 contrib/diffutils/lib/printf-parse.h               |    4 +-
 contrib/diffutils/lib/progname.c                   |    4 +-
 contrib/diffutils/lib/progname.h                   |    4 +-
 contrib/diffutils/lib/propername.c                 |    4 +-
 contrib/diffutils/lib/propername.h                 |   16 +-
 contrib/diffutils/lib/quote.h                      |    4 +-
 contrib/diffutils/lib/quotearg.c                   |  204 +-
 contrib/diffutils/lib/quotearg.h                   |   40 +-
 contrib/diffutils/lib/rawmemchr.c                  |  136 +
 contrib/diffutils/lib/regcomp.c                    |  571 +--
 contrib/diffutils/lib/regex.c                      |    6 +-
 contrib/diffutils/lib/regex.h                      |   81 +-
 contrib/diffutils/lib/regex_internal.c             |  304 +-
 contrib/diffutils/lib/regex_internal.h             |  171 +-
 contrib/diffutils/lib/regexec.c                    |  822 ++--
 contrib/diffutils/lib/secure_getenv.c              |   41 -
 contrib/diffutils/lib/sh-quote.c                   |    4 +-
 contrib/diffutils/lib/sh-quote.h                   |    4 +-
 contrib/diffutils/lib/sig-handler.h                |   18 +-
 contrib/diffutils/lib/stat-time.h                  |   98 +-
 contrib/diffutils/lib/stdio--.h                    |    4 +-
 contrib/diffutils/lib/stdio-safer.h                |    4 +-
 contrib/diffutils/lib/str-kmp.h                    |    6 +-
 contrib/diffutils/lib/streq.h                      |    4 +-
 contrib/diffutils/lib/strerror-override.c          |    4 +-
 contrib/diffutils/lib/strerror-override.h          |    6 +-
 contrib/diffutils/lib/strerror.c                   |    7 +-
 contrib/diffutils/lib/strftime.h                   |   11 +-
 contrib/diffutils/lib/striconv.c                   |    4 +-
 contrib/diffutils/lib/striconv.h                   |    4 +-
 contrib/diffutils/lib/stripslash.c                 |    4 +-
 contrib/diffutils/lib/strnlen1.c                   |    4 +-
 contrib/diffutils/lib/strnlen1.h                   |    4 +-
 contrib/diffutils/lib/system-quote.c               |   20 +-
 contrib/diffutils/lib/system-quote.h               |    6 +-
 contrib/diffutils/lib/tempname.c                   |  123 +-
 contrib/diffutils/lib/tempname.h                   |   19 +-
 contrib/diffutils/lib/time-internal.h              |   49 +
 contrib/diffutils/lib/time_rz.c                    |  344 ++
 contrib/diffutils/lib/timegm.c                     |   34 +
 contrib/diffutils/lib/timespec.h                   |   78 +-
 contrib/diffutils/lib/trim.c                       |    6 +-
 contrib/diffutils/lib/trim.h                       |    4 +-
 contrib/diffutils/lib/unistd.c                     |    4 +
 contrib/diffutils/lib/unistr/u8-mbtoucr.c          |  149 +-
 contrib/diffutils/lib/unistr/u8-uctomb-aux.c       |   27 +-
 contrib/diffutils/lib/unistr/u8-uctomb.c           |   17 +-
 contrib/diffutils/lib/uniwidth/cjk.h               |    4 +-
 contrib/diffutils/lib/uniwidth/width.c             |  176 +-
 contrib/diffutils/lib/unlocked-io.h                |    4 +-
 contrib/diffutils/lib/vasnprintf.c                 |  269 +-
 contrib/diffutils/lib/vasnprintf.h                 |    4 +-
 contrib/diffutils/lib/verify.h                     |  142 +-
 contrib/diffutils/lib/version-etc-fsf.c            |    4 +-
 contrib/diffutils/lib/version-etc.c                |   18 +-
 contrib/diffutils/lib/version-etc.h                |    4 +-
 contrib/diffutils/lib/wctype-h.c                   |    4 +
 contrib/diffutils/lib/xalloc-die.c                 |    4 +-
 contrib/diffutils/lib/xalloc-oversized.h           |   54 +-
 contrib/diffutils/lib/xalloc.h                     |   42 +-
 contrib/diffutils/lib/xasprintf.c                  |    4 +-
 contrib/diffutils/lib/xfreopen.c                   |    6 +-
 contrib/diffutils/lib/xmalloc.c                    |   14 +-
 contrib/diffutils/lib/xreadlink.c                  |    4 +-
 contrib/diffutils/lib/xreadlink.h                  |    4 +-
 contrib/diffutils/lib/xsize.h                      |    7 +-
 contrib/diffutils/lib/xstriconv.c                  |    4 +-
 contrib/diffutils/lib/xstriconv.h                  |    4 +-
 contrib/diffutils/lib/xstrndup.c                   |    4 +-
 contrib/diffutils/lib/xstrndup.h                   |    6 +-
 contrib/diffutils/lib/xstrtol-error.c              |    4 +-
 contrib/diffutils/lib/xstrtol.c                    |   62 +-
 contrib/diffutils/lib/xstrtol.h                    |    4 +-
 contrib/diffutils/lib/xvasprintf.c                 |    4 +-
 contrib/diffutils/lib/xvasprintf.h                 |    4 +-
 contrib/diffutils/man/diff.1                       |   47 +-
 contrib/diffutils/man/diff3.1                      |   22 +-
 contrib/diffutils/man/sdiff.1                      |   22 +-
 contrib/diffutils/src/analyze.c                    |   39 +-
 contrib/diffutils/src/context.c                    |  105 +-
 contrib/diffutils/src/die.h                        |   31 +
 contrib/diffutils/src/diff.c                       |  105 +-
 contrib/diffutils/src/diff.h                       |   37 +-
 contrib/diffutils/src/diff3.c                      |  122 +-
 contrib/diffutils/src/dir.c                        |   54 +-
 contrib/diffutils/src/ed.c                         |   12 +-
 contrib/diffutils/src/ifdef.c                      |   21 +-
 contrib/diffutils/src/io.c                         |   56 +-
 contrib/diffutils/src/normal.c                     |   30 +-
 contrib/diffutils/src/sdiff.c                      |   56 +-
 contrib/diffutils/src/side.c                       |   33 +-
 contrib/diffutils/src/system.h                     |   49 +-
 contrib/diffutils/src/util.c                       |  781 +++-
 192 files changed, 12443 insertions(+), 6879 deletions(-)
 create mode 100644 contrib/diffutils/lib/argmatch.c
 create mode 100644 contrib/diffutils/lib/argmatch.h
 copy contrib/diffutils/lib/{stdio--.h => assure.h} (51%)
 create mode 100644 contrib/diffutils/lib/cdefs.h
 create mode 100644 contrib/diffutils/lib/cloexec.c
 create mode 100644 contrib/diffutils/lib/cloexec.h
 create mode 100644 contrib/diffutils/lib/dup2.c
 create mode 100644 contrib/diffutils/lib/fcntl.c
 create mode 100644 contrib/diffutils/lib/fd-hook.c
 create mode 100644 contrib/diffutils/lib/filename.h
 create mode 100644 contrib/diffutils/lib/flexmember.h
 create mode 100644 contrib/diffutils/lib/freopen.c
 create mode 100644 contrib/diffutils/lib/getopt-core.h
 create mode 100644 contrib/diffutils/lib/getopt-ext.h
 create mode 100644 contrib/diffutils/lib/getopt-pfx-core.h
 create mode 100644 contrib/diffutils/lib/getopt-pfx-ext.h
 create mode 100644 contrib/diffutils/lib/getprogname.c
 copy contrib/diffutils/lib/{stdio-safer.h => getprogname.h} (52%)
 create mode 100644 contrib/diffutils/lib/libc-config.h
 create mode 100644 contrib/diffutils/lib/localtime-buffer.c
 copy contrib/diffutils/lib/{asnprintf.c => localtime-buffer.h} (52%)
 create mode 100644 contrib/diffutils/lib/minmax.h
 create mode 100644 contrib/diffutils/lib/mktime-internal.h
 create mode 100644 contrib/diffutils/lib/mktime.c
 rename contrib/diffutils/lib/{strftime.c => nstrftime.c} (83%)
 create mode 100644 contrib/diffutils/lib/rawmemchr.c
 delete mode 100644 contrib/diffutils/lib/secure_getenv.c
 create mode 100644 contrib/diffutils/lib/time-internal.h
 create mode 100644 contrib/diffutils/lib/time_rz.c
 create mode 100644 contrib/diffutils/lib/timegm.c
 create mode 100644 contrib/diffutils/lib/unistd.c
 create mode 100644 contrib/diffutils/lib/wctype-h.c
 create mode 100644 contrib/diffutils/src/die.h

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/6ea1f93e6f10fea69952ac2c2c3720139429929b


-- 
DragonFly BSD source repository



More information about the Commits mailing list