head 1.4; access; symbols perseant-exfatfs-base-20250801:1.4 perseant-exfatfs-base-20240630:1.4 cjep_sun2x:1.4.0.14 cjep_sun2x-base:1.4 cjep_staticlib_x-base1:1.4 cjep_staticlib_x:1.4.0.12 cjep_staticlib_x-base:1.4 phil-wifi-20200421:1.4 phil-wifi-20200411:1.4 phil-wifi-20200406:1.4 pgoyette-compat-merge-20190127:1.4 pgoyette-compat-20190127:1.4 pgoyette-compat-20190118:1.4 pgoyette-compat-1226:1.4 pgoyette-compat-1126:1.4 pgoyette-compat-1020:1.4 pgoyette-compat-0930:1.4 pgoyette-compat-0906:1.4 netbsd-7-2-RELEASE:1.3 pgoyette-compat-0728:1.4 pgoyette-compat-0625:1.4 pgoyette-compat-0521:1.4 pgoyette-compat-0502:1.4 pgoyette-compat-0422:1.4 pgoyette-compat-0415:1.4 pgoyette-compat-0407:1.4 pgoyette-compat-0330:1.4 pgoyette-compat-0322:1.4 pgoyette-compat-0315:1.4 netbsd-7-1-2-RELEASE:1.3 pgoyette-compat:1.4.0.10 pgoyette-compat-base:1.4 netbsd-7-1-1-RELEASE:1.3 perseant-stdc-iso10646:1.4.0.8 perseant-stdc-iso10646-base:1.4 prg-localcount2-base3:1.4 prg-localcount2-base2:1.4 prg-localcount2-base1:1.4 prg-localcount2:1.4.0.6 prg-localcount2-base:1.4 pgoyette-localcount-20170426:1.4 bouyer-socketcan-base1:1.4 pgoyette-localcount-20170320:1.4 netbsd-7-1:1.3.0.80 netbsd-7-1-RELEASE:1.3 netbsd-7-1-RC2:1.3 netbsd-7-nhusb-base-20170116:1.3 bouyer-socketcan:1.4.0.4 bouyer-socketcan-base:1.4 pgoyette-localcount-20170107:1.4 netbsd-7-1-RC1:1.3 pgoyette-localcount-20161104:1.4 netbsd-7-0-2-RELEASE:1.3 localcount-20160914:1.4 netbsd-7-nhusb:1.3.0.78 netbsd-7-nhusb-base:1.3 pgoyette-localcount-20160806:1.4 pgoyette-localcount-20160726:1.4 pgoyette-localcount:1.4.0.2 pgoyette-localcount-base:1.4 netbsd-7-0-1-RELEASE:1.3 netbsd-7-0:1.3.0.76 netbsd-7-0-RELEASE:1.3 netbsd-7-0-RC3:1.3 netbsd-7-0-RC2:1.3 netbsd-7-0-RC1:1.3 netbsd-5-2-3-RELEASE:1.3 netbsd-5-1-5-RELEASE:1.3 netbsd-6-0-6-RELEASE:1.3 netbsd-6-1-5-RELEASE:1.3 netbsd-7:1.3.0.74 netbsd-7-base:1.3 yamt-pagecache-base9:1.3 yamt-pagecache-tag8:1.3 netbsd-6-1-4-RELEASE:1.3 netbsd-6-0-5-RELEASE:1.3 tls-earlyentropy:1.3.0.72 tls-earlyentropy-base:1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.3 riastradh-drm2-base3:1.3 netbsd-6-1-3-RELEASE:1.3 netbsd-6-0-4-RELEASE:1.3 netbsd-5-2-2-RELEASE:1.3 netbsd-5-1-4-RELEASE:1.3 netbsd-6-1-2-RELEASE:1.3 netbsd-6-0-3-RELEASE:1.3 netbsd-5-2-1-RELEASE:1.3 netbsd-5-1-3-RELEASE:1.3 netbsd-6-1-1-RELEASE:1.3 riastradh-drm2-base2:1.3 riastradh-drm2-base1:1.3 riastradh-drm2:1.3.0.66 riastradh-drm2-base:1.3 netbsd-6-1:1.3.0.70 netbsd-6-0-2-RELEASE:1.3 netbsd-6-1-RELEASE:1.3 netbsd-6-1-RC4:1.3 netbsd-6-1-RC3:1.3 agc-symver:1.3.0.68 agc-symver-base:1.3 netbsd-6-1-RC2:1.3 netbsd-6-1-RC1:1.3 yamt-pagecache-base8:1.3 netbsd-5-2:1.3.0.64 netbsd-6-0-1-RELEASE:1.3 yamt-pagecache-base7:1.3 netbsd-5-2-RELEASE:1.3 netbsd-5-2-RC1:1.3 matt-nb6-plus-nbase:1.3 yamt-pagecache-base6:1.3 netbsd-6-0:1.3.0.62 netbsd-6-0-RELEASE:1.3 netbsd-6-0-RC2:1.3 tls-maxphys:1.3.0.60 tls-maxphys-base:1.3 matt-nb6-plus:1.3.0.58 matt-nb6-plus-base:1.3 netbsd-6-0-RC1:1.3 yamt-pagecache-base5:1.3 yamt-pagecache-base4:1.3 netbsd-6:1.3.0.56 netbsd-6-base:1.3 netbsd-5-1-2-RELEASE:1.3 netbsd-5-1-1-RELEASE:1.3 yamt-pagecache-base3:1.3 yamt-pagecache-base2:1.3 yamt-pagecache:1.3.0.54 yamt-pagecache-base:1.3 cherry-xenmp:1.3.0.52 cherry-xenmp-base:1.3 bouyer-quota2-nbase:1.3 bouyer-quota2:1.3.0.50 bouyer-quota2-base:1.3 matt-mips64-premerge-20101231:1.3 matt-nb5-mips64-premerge-20101231:1.3 matt-nb5-pq3:1.3.0.48 matt-nb5-pq3-base:1.3 netbsd-5-1:1.3.0.46 netbsd-5-1-RELEASE:1.3 netbsd-5-1-RC4:1.3 matt-nb5-mips64-k15:1.3 netbsd-5-1-RC3:1.3 netbsd-5-1-RC2:1.3 netbsd-5-1-RC1:1.3 netbsd-5-0-2-RELEASE:1.3 matt-nb5-mips64-premerge-20091211:1.3 matt-premerge-20091211:1.3 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3 matt-nb4-mips64-k7-u2a-k9b:1.3 matt-nb5-mips64-u1-k1-k5:1.3 matt-nb5-mips64:1.3.0.44 netbsd-5-0-1-RELEASE:1.3 jym-xensuspend-nbase:1.3 netbsd-5-0:1.3.0.42 netbsd-5-0-RELEASE:1.3 netbsd-5-0-RC4:1.3 netbsd-5-0-RC3:1.3 netbsd-5-0-RC2:1.3 jym-xensuspend:1.3.0.40 jym-xensuspend-base:1.3 netbsd-5-0-RC1:1.3 netbsd-5:1.3.0.38 netbsd-5-base:1.3 matt-mips64-base2:1.3 matt-mips64:1.3.0.36 mjf-devfs2:1.3.0.34 mjf-devfs2-base:1.3 netbsd-4-0-1-RELEASE:1.3 wrstuden-revivesa-base-3:1.3 wrstuden-revivesa-base-2:1.3 wrstuden-fixsa-newbase:1.3 wrstuden-revivesa-base-1:1.3 yamt-pf42-base4:1.3 yamt-pf42-base3:1.3 hpcarm-cleanup-nbase:1.3 yamt-pf42-baseX:1.3 yamt-pf42-base2:1.3 wrstuden-revivesa:1.3.0.32 wrstuden-revivesa-base:1.3 yamt-pf42:1.3.0.30 yamt-pf42-base:1.3 keiichi-mipv6:1.3.0.28 keiichi-mipv6-base:1.3 matt-armv6-nbase:1.3 matt-armv6-prevmlocking:1.3 wrstuden-fixsa-base-1:1.3 netbsd-4-0:1.3.0.26 netbsd-4-0-RELEASE:1.3 cube-autoconf:1.3.0.24 cube-autoconf-base:1.3 netbsd-4-0-RC5:1.3 netbsd-4-0-RC4:1.3 netbsd-4-0-RC3:1.3 netbsd-4-0-RC2:1.3 netbsd-4-0-RC1:1.3 matt-armv6:1.3.0.22 matt-armv6-base:1.3 matt-mips64-base:1.3 hpcarm-cleanup:1.3.0.20 hpcarm-cleanup-base:1.3 netbsd-3-1-1-RELEASE:1.3 netbsd-3-0-3-RELEASE:1.3 wrstuden-fixsa:1.3.0.18 wrstuden-fixsa-base:1.3 abandoned-netbsd-4-base:1.3 abandoned-netbsd-4:1.3.0.12 netbsd-3-1:1.3.0.14 netbsd-3-1-RELEASE:1.3 netbsd-3-0-2-RELEASE:1.3 netbsd-3-1-RC4:1.3 netbsd-3-1-RC3:1.3 netbsd-3-1-RC2:1.3 netbsd-3-1-RC1:1.3 netbsd-4:1.3.0.16 netbsd-4-base:1.3 netbsd-3-0-1-RELEASE:1.3 netbsd-3-0:1.3.0.10 netbsd-3-0-RELEASE:1.3 netbsd-3-0-RC6:1.3 netbsd-3-0-RC5:1.3 netbsd-3-0-RC4:1.3 netbsd-3-0-RC3:1.3 netbsd-3-0-RC2:1.3 netbsd-3-0-RC1:1.3 netbsd-2-0-3-RELEASE:1.3 netbsd-2-1:1.3.0.8 netbsd-2-1-RELEASE:1.3 netbsd-2-1-RC6:1.3 netbsd-2-1-RC5:1.3 netbsd-2-1-RC4:1.3 netbsd-2-1-RC3:1.3 netbsd-2-1-RC2:1.3 netbsd-2-1-RC1:1.3 netbsd-2-0-2-RELEASE:1.3 netbsd-3:1.3.0.6 netbsd-3-base:1.3 netbsd-2-0-1-RELEASE:1.3 netbsd-2:1.3.0.4 netbsd-2-base:1.3 netbsd-2-0-RELEASE:1.3 netbsd-2-0-RC5:1.3 netbsd-2-0-RC4:1.3 netbsd-2-0-RC3:1.3 netbsd-2-0-RC2:1.3 netbsd-2-0-RC1:1.3 netbsd-2-0:1.3.0.2 netbsd-2-0-base:1.3 diffutils-2-8-1:1.1.1.2 diffutils-2-7:1.1.1.1 FSF:1.1.1; locks; strict; comment @# @; 1.4 date 2016.01.13.03.41.44; author christos; state dead; branches; next 1.3; commitid JRvLQos5oSApNIQy; 1.3 date 2003.01.26.01.53.41; author wiz; state Exp; branches; next 1.2; 1.2 date 99.02.12.12.44.58; author tv; state dead; branches; next 1.1; 1.1 date 99.02.12.12.27.04; author tv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.02.12.12.27.04; author tv; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2003.01.26.00.43.03; author wiz; state Exp; branches; next ; desc @@ 1.4 log @diffutils has moved @ text @User-visible changes in version 2.8.1: * Documentation fixes. User-visible changes in version 2.8: * cmp and diff now conform to POSIX 1003.1-2001 (IEEE Std 1003.1-2001) if the underlying system conforms to POSIX and if the _POSIX2_VERSION environment variable is set to 200112. Conformance removes support for `diff -NUM', where NUM is a number. Use -C NUM or -U NUM instead. * cmp now supports trailing operands SKIP1 and SKIP2, like BSD cmp. * cmp -i or --ignore-initial now accepts SKIP1:SKIP2 option value. * New cmp option: -n or --bytes. * cmp's old -c or --print-chars option has been renamed; use -b or --print-bytes instead. * cmp now outputs "byte" rather than "char" outside the POSIX locale. * cmp -l's index column width now adjusts to fit larger (or smaller) files. * cmp -l -s and cmp -s -l are not allowed. Use cmp -s or cmp -l instead. * diff uses ISO 8601 style time stamps for output times (e.g. "2001-11-23 16:44:36.875702460 -0800") unless in the C or POSIX locale and the -c style is specified. * diff's -I and -F options use the regexp syntax of grep, not of Emacs. * diff now accepts multiple context arguments, and uses their maximum value. * New diff and sdiff options: -E --ignore-tab-expansion --strip-trailing-cr * New diff options: --from-file=FILE, --to-file=FILE --ignore-file-name-case --no-ignore-file-name-case * New diff3 and sdiff option: --diff-program=PROGRAM * The following diff options are still accepted, but are no longer documented. They may be withdrawn in future releases. -h (omit; it has no effect) -H (use --speed-large-files instead) -L (use --label instead) -P (use --unidirectional-new-file instead) --inhibit-hunk-merge (omit; it has no effect) * Recursive diffs now sort file names according to the LC_COLLATE locale category if possible, instead of using native byte comparison. * Diff printf specs can now use the "0" and "'" flags. * The new sdiff interactive command `ed' precedes each version with a header. * On 64-bit hosts, files larger than 2 GB can be compared. * Some internationalization support has been added, but multibyte locales are still not completely supported yet. * Some diagnostics have been reworded slightly for consistency. Also, `diff -D FOO' now outputs `/* ! FOO */' instead of `/* not FOO */'. * The `patch' part of the manual now describes `patch' version 2.5.4. * Man pages are now distributed and installed. * There is support for DJGPP; see the 'ms' subdirectory and the files m4/dos.m4 and */setmode.*. User-visible changes in version 2.7: * New diff option: --binary (useful only on non-POSIX hosts) * diff -b and -w now ignore line incompleteness; -B no longer does this. * cmp -c now uses locale to decide which output characters to quote. * Help and version messages are reorganized. User-visible changes in version 2.6: * New cmp, diff, diff3, sdiff option: --help * A new heuristic for diff greatly reduces the time needed to compare large input files that contain many differences. * Partly as a result, GNU diff's output is not exactly the same as before. Usually it is a bit smaller, but sometimes it is a bit larger. User-visible changes in version 2.5: * New cmp option: -v --version User-visible changes in version 2.4: * New cmp option: --ignore-initial=BYTES * New diff3 option: -T --initial-tab * New diff option: --line-format=FORMAT * New diff group format specifications: [eflmnEFLMN] A printf spec followed by one of the following letters causes the integer corresponding to that letter to be printed according to the printf specification. E.g. `%5df' prints the number of the first line in the group in the old file using the "%5d" format. e: line number just before the group in old file; equals f - 1 f: first line number in group in the old file l: last line number in group in the old file m: line number just after the group in old file; equals l + 1 n: number of lines in group in the old file; equals l - f + 1 E, F, L, M, N: likewise, for lines in the new file %(A=B?T:E) If A equals B then T else E. A and B are each either a decimal constant or a single letter interpreted as above. T and E are arbitrary format strings. This format spec is equivalent to T if A's value equals B's; otherwise it is equivalent to E. For example, `%(N=0?no:%dN) line%(N=1?:s)' is equivalent to `no lines' if N (the number of lines in the group in the the new file) is 0, to `1 line' if N is 1, and to `%dN lines' otherwise. %c'C' where C is a single character, stands for the character C. C may not be a backslash or an apostrophe. E.g. %c':' stands for a colon. %c'\O' where O is a string of 1, 2, or 3 octal digits, stands for the character with octal code O. E.g. %c'\0' stands for a null character. * New diff line format specifications: n The line number, printed with . E.g. `%5dn' prints the line number with a "%5d" format. %c'C' %c'\O' The character C, or with octal code O, as above. * Supported s have the same meaning as with printf, but must match the extended regular expression %-*[0-9]*(\.[0-9]*)?[doxX]. * The format spec %0 introduced in version 2.1 has been removed, since it is incompatible with printf specs like %02d. To represent a null char, use %c'\0' instead. * cmp and diff now conform to POSIX 1003.2-1992 (ISO/IEC 9945-2:1993) if the underlying system conforms to POSIX: - Some messages' wordings are changed in minor ways. - ``White space'' is now whatever C's `isspace' says it is. - When comparing directories, if `diff' finds a file that is not a regular file or a directory, it reports the file's type instead of diffing it. (As usual, it follows symbolic links first.) - When signaled, sdiff exits with the signal's status, not with status 2. * Now portable to hosts where int, long, pointer, etc. are not all the same size. * `cmp - -' now works like `diff - -'. User-visible changes in version 2.3: * New diff option: --horizon-lines=lines User-visible changes in version 2.1: * New diff options: --{old,new,unchanged}-line-format='format' --{old,new,unchanged,changed}-group-format='format' -U * New diff3 option: -A --show-all * diff3 -m now defaults to -A, not -E. * diff3 now takes up to three -L or --label options, not just two. If just two options are given, they refer to the first two input files, not the first and third input files. * sdiff and diff -y handle incomplete lines. User-visible changes in version 2.0: * Add sdiff and cmp programs. * Add Texinfo documentation. * Add configure script. * Improve diff performance. * New diff options: -x --exclude -X --exclude-from -P --unidirectional-new-file -W --width -y --side-by-side --left-column --sdiff-merge-assist --suppress-common-lines * diff options renamed: --label renamed from --file-label --forward-ed renamed from --reversed-ed --paginate renamed from --print --entire-new-file renamed from --entire-new-files --new-file renamed from --new-files --all-text removed * New diff3 options: -v --version * Add long-named equivalents for other diff3 options. * diff options -F (--show-function-line) and -I (--ignore-matching-lines) can now be given more than once. Copyright (C) 1993, 1994, 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Diffutils. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @ 1.3 log @Re-add. @ text @@ 1.2 log @Add some patches, delete Infodoc, and delete files not used for a NetBSD build. @ text @d1 54 d57 1 a57 1 * New diff option: --binary (useful only on non-Posix hosts) d121 2 a122 2 * cmp and diff now conform to Posix.2 (ISO/IEC 9945-2:1993) if the underlying system conforms to Posix: d181 22 @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Use dist layout for diffutils, for easier upgrades and texinfo doc. @ text @@ 1.1.1.2 log @Import of diffutils-2.8.1 (converted with to-be-committed diffutils2netbsd script). @ text @a0 54 User-visible changes in version 2.8.1: * Documentation fixes. User-visible changes in version 2.8: * cmp and diff now conform to POSIX 1003.1-2001 (IEEE Std 1003.1-2001) if the underlying system conforms to POSIX and if the _POSIX2_VERSION environment variable is set to 200112. Conformance removes support for `diff -NUM', where NUM is a number. Use -C NUM or -U NUM instead. * cmp now supports trailing operands SKIP1 and SKIP2, like BSD cmp. * cmp -i or --ignore-initial now accepts SKIP1:SKIP2 option value. * New cmp option: -n or --bytes. * cmp's old -c or --print-chars option has been renamed; use -b or --print-bytes instead. * cmp now outputs "byte" rather than "char" outside the POSIX locale. * cmp -l's index column width now adjusts to fit larger (or smaller) files. * cmp -l -s and cmp -s -l are not allowed. Use cmp -s or cmp -l instead. * diff uses ISO 8601 style time stamps for output times (e.g. "2001-11-23 16:44:36.875702460 -0800") unless in the C or POSIX locale and the -c style is specified. * diff's -I and -F options use the regexp syntax of grep, not of Emacs. * diff now accepts multiple context arguments, and uses their maximum value. * New diff and sdiff options: -E --ignore-tab-expansion --strip-trailing-cr * New diff options: --from-file=FILE, --to-file=FILE --ignore-file-name-case --no-ignore-file-name-case * New diff3 and sdiff option: --diff-program=PROGRAM * The following diff options are still accepted, but are no longer documented. They may be withdrawn in future releases. -h (omit; it has no effect) -H (use --speed-large-files instead) -L (use --label instead) -P (use --unidirectional-new-file instead) --inhibit-hunk-merge (omit; it has no effect) * Recursive diffs now sort file names according to the LC_COLLATE locale category if possible, instead of using native byte comparison. * Diff printf specs can now use the "0" and "'" flags. * The new sdiff interactive command `ed' precedes each version with a header. * On 64-bit hosts, files larger than 2 GB can be compared. * Some internationalization support has been added, but multibyte locales are still not completely supported yet. * Some diagnostics have been reworded slightly for consistency. Also, `diff -D FOO' now outputs `/* ! FOO */' instead of `/* not FOO */'. * The `patch' part of the manual now describes `patch' version 2.5.4. * Man pages are now distributed and installed. * There is support for DJGPP; see the 'ms' subdirectory and the files m4/dos.m4 and */setmode.*. d3 1 a3 1 * New diff option: --binary (useful only on non-POSIX hosts) d67 2 a68 2 * cmp and diff now conform to POSIX 1003.2-1992 (ISO/IEC 9945-2:1993) if the underlying system conforms to POSIX: a126 22 Copyright (C) 1993, 1994, 1998, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Diffutils. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @