Lines Matching +full:reg +full:- +full:spacing
1 2004-04-13 Paul Eggert <eggert@twinsun.com>
5 (XGETTEXT): Restore from pre-2004-04-12 version. This fixes
9 of "make distcheck" which operates with read-only directories.
13 2004-04-12 Paul Eggert <eggert@twinsun.com>
20 --help" for special "configure" options. Suggest latest libiconv.
51 (Binary): -q doesn't exactly cause diff to assume files are binary.
54 Detailed if-then-else, diff3 Hunks, Detailed diff3 Normal):
59 (Line Group Formats, Reject Names): Fix duplicate-word typos.
61 ignored in the -X file.
62 (diff Options): Add --strip-trailing-cr.
63 (Projects): gnu -> gvc@gnu.org.
73 * lib/inttostr.c (inttostr): Protect i < 0 by compile-time
87 * src/cmp.c: Sort includes. Include <exit.h>, <unlocked-io.h>.
117 Remove now-unnecessary tests.
119 * src/diff.h: Include regex.h, unlocked-io.h.
124 * src/diff3.c: Include unlocked-io.h.
128 Add --strip-trailing-cr support.
142 Use them to fix line-number computation bug.
146 lessens the number of potentially-dangerous casts.
149 * src/sdiff.c: Include <unlocked-io.h>, <exit.h>.
154 (main): Likewise. Fix getopt typo: -E wasn't supported.
171 which led to undefined behavior on 64-bit hosts.
172 Use more-standard test for exit status 126 versus 127.
176 2004-03-15 Paul Eggert <eggert@twinsun.com>
181 <http://mail.gnu.org/archive/html/bug-gnu-utils/2004-03/msg00024.html>.
183 2004-03-11 Paul Eggert <eggert@twinsun.com>
195 2004-02-09 Paul Eggert <eggert@twinsun.com>
200 2002-10-14 Paul Eggert <eggert@twinsun.com>
205 <http://mail.gnu.org/pipermail/bug-gnu-utils/2002-October/003251.html>.
208 2002-10-13 Paul Eggert <eggert@twinsun.com>
213 It also works around what appears to be a bug with GNU make -j
216 2002-06-27 Paul Eggert <eggert@twinsun.com>
223 * lib/file-type.h: Protect against double inclusion. Detect
230 2002-06-22 Paul Eggert <eggert@twinsun.com>
232 * lib/c-stack.c (segv_handler, c_stack_action) [! defined
236 2002-06-16 Paul Eggert <eggert@twinsun.com>
245 Add lib/file-type.c, lib/version-etc.c, lib/xmalloc.c.
247 2002-06-15 Paul Eggert <eggert@twinsun.com>
253 Add version-etc.h.
254 (libdiffutils_a_SOURCES): Remove freesoft.c. Add version-etc.c.
256 * lib/version-etc.h (PARAMS): Remove; we now assume C89 at least.
258 * lib/version-etc.h (version_etc): Remove package and version args.
260 * lib/version-etc.c: Likewise.
261 Do not include unlocked-io.h; no longer needed.
267 * lib/version-etc.c, lib/version-etc.h: New files, taken from
274 * src/cmp.c: Include version-etc.h, not freesoft.h.
282 2002-06-11 Paul Eggert <eggert@twinsun.com>
293 * ABOUT-NLS, config/config.guess, config/config.sub,
295 m4/c-bs-a.m4, m4/gettext.m4, m4/gnu-source.m4, m4/lib-link.m4,
312 * doc/diff.texi: Reword "@option{-f} and @option{--foo}" to
313 "@option{-f} or @option{--foo}".
318 (Binary): Mention --verbose and --print-bytes.
320 New option --tabsize=COLUMNS.
325 Add file-type.h.
326 (libdiffutils_a_SOURCES): Add file-type.c.
329 * lib/c-stack.c (__attribute__): New macro.
353 * lib/c-stack.h (siginfo_t, c_stack_die): Remove decl.
355 * lib/file-type.c, lib/file-type.h: New files. These contain code
359 * lib/fnmatch.c (alloca, __builtin_expect): Define for non-GCC hosts.
384 * m4/c-stack.m4 (jm_PREREQ_C_STACK): Do not AC_REQUIRE
393 * m4/gnu-source.m4: Likewise, for AC_GNU_SOURCE (renamed from
415 src/sdiff.c: Include <file-type.h>.
426 (filetype): Move to lib/file-type.c and rename to file_type.
429 * src/diff.c (longopts, main, usage): New option --tabsize=COLUMNS.
446 (longopts, usage, main): New option --tabsize=COLUMNS.
451 New option --tabsize=COLUMNS.
454 S_ISSOCK): Remove; now in lib/file-type.h.
457 (lines_differ, output_1_line): New option --tabsize=COLUMNS.
458 (analyze_hunk): If -b or -w is also specified, -B now considers
461 2002-04-05 Paul Eggert <eggert@sic.twinsun.com>
474 * src/analyze.c (diff_2_files): Assign PTRDIFF_MAX - 1 to a
483 resulting behavior is implementation-defined. Work around bug in
497 Fix bug in -w documentation noted by Karl Berry.
502 2002-03-26 Paul Eggert <eggert@twinsun.com>
508 2002-03-26 Albert Chin-A-Young <china@thewrittenword.com>
510 * src/Makefile.am (datadir): Remove, as it conflicts with --datadir.
512 2002-03-26 Paul Eggert <eggert@twinsun.com>
517 to work around a compatibility problem with Debian install-info.
519 2002-03-24 Eli Zaretskii <eliz@is.elta.co.il>
524 2002-03-23 Paul Eggert <eggert@twinsun.com>
533 * src/diff.c (main): Fix typo that prevented diff -y from working.
536 2002-03-15 Paul Eggert <eggert@twinsun.com>
538 * lib/c-stack.c (c_stack_die) [!HAVE_SIGINFO_T]: Don't use info.
541 2002-03-15 Eli Zaretskii <eliz@is.elta.co.il>
543 * ms/config.sed: Tweak editing of install-info-am target.
545 2002-03-12 Paul Eggert <eggert@twinsun.com>
549 * NEWS: cmp -l -s and cmp -s -l are not allowed.
550 Deprecate diff -h, -H, -L, -P, --inhibit-hunk-merge.
557 Do not document diff -L.
559 Do not document diff -P.
561 Do not document diff -H.
562 (diff Performance, diff Options): Do not document --horizon-lines.
563 (cmp Options): Prefer -b to -c.
566 Document --help, and use the same wording for --verbose.
567 (diff3 Options): Fix typo in description of -E, which used wrongly used
568 "-e" instead of "-E".
570 * lib/hard-locale.c (alloca): Remove.
579 (check_stdout): "indices and codes" -> "byte numbers and values"
584 * src/diff.c (option_help_msgid): Do not document -L, -P,
585 --horizon-lines, --inhibit-hunk-merge, -H.
586 * src/diff.h: -L -> --label
588 2002-03-11 Paul Eggert <eggert@twinsun.com>
609 * lib/c-stack.c: Include <errno.h>
624 * m4/c-stack.m4 (AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC): Change
641 config/install-sh, config/mdate-sh, config/missing,
645 2002-03-04 Bruno Haible <haible@ilog.fr>
650 2002-03-02 Eli Zaretskii <eliz@is.elta.co.il>
652 * ms/config.sed: Tweak editing of install-info-am and
653 uninstall-info-am targets, to include 8+3-butchered names of Info
656 2002-02-28 Paul Eggert <eggert@twinsun.com>
669 (Making Patches): Mention -U 2.
670 (diff Options): Deprecate -LINES, as POSIX 1003.1-2001 does not
676 POSIX 1003.1-2001 patch for Automake.
685 * lib/c-stack.c, lib/c-stack.h, lib/exitfail.c, lib/exitfail.h,
686 lib/posixver.c, lib/posixver.h, m4/c-stack.m4, m4/gnu-source.m4,
693 intl/gettext.c, intl/gettextP.h, intl/gmo.h, intl/hash-string.h,
694 intl/intl-compat.c, intl/l10nflist.c, intl/libgnuintl.h,
698 intl/plural-eval.c, intl/plural-exp.c, intl/plural-exp.h,
699 intl/plural.c, intl/plural.y, intl/ref-add.sin, intl/ref-del.sin,
700 intl/textdomain.c, m4/isc-posix.m4, m4/libtool.m4: Remove.
702 * ABOUT-NLS: Update to Gettext 0.11.
715 * lib/Makefile.am (noinst_HEADERS): Add c-stack.h, exitfail.h.
716 (libdiffutils_a_SOURCES): Add c-stack.c, exitfail.c, quotesys.c.
732 * lib/hard-locale.c: Include "hard-locale.h".
744 * po/POTFILES.in: Add lib/c-stack.c, src/dir.c.
746 * src/Makefile.am (datadir): @DATADIRNAME@ -> share.
754 * src/cmp.c: Include c-stack.h, exitfail.h.
756 (try_help, check_stdout, main, cmp): 2 -> EXIT_TROUBLE.
758 0 -> EXIT_SUCCESS.
759 1 -> EXIT_FAILURE.
770 * src/diff.h: unsigned -> unsigned int.
771 * src/diff.c: Include c-stack.h, exitfail.h.
777 (main): 0 -> EXIT_SUCCESS, 1 -> EXIT_FAILURE, 2 -> EXIT_TROUBLE.
782 -c is equivalent to -C 3 now, instead of having an implicit context;
783 likewise for -u and -U 3.
786 Use new style time stamp format for -u / -U.
787 Reject numeric-string options if operating in POSIX 1003.1-2001 mode.
789 Simplify from-file and to-file code.
793 (compare_files): 0 -> EXIT_SUCCESS, 1 -> EXIT_FAILURE, 2 ->
796 * src/diff3.c: Include c-stack.h, exitfail.h.
801 0 -> EXIT_SUCCESS, 1 -> EXIT_FAIULRE, 2 -> EXIT_TROUBLE.
804 2 -> EXIT_TROUBLE.
806 for compatibility with POSIX 1003.1-2001.
810 (fatal, perror_with_exit): 2 -> EXIT_TROUBLE.
815 (diff_dirs): 0 -> EXIT_SUCCESS, 2 -> EXIT_TROUBLE.
832 * src/sdiff.c: Include c-stack.h, exitfail.h. Do not include signal.h.
833 0 -> EXIT_SUCCESS, 1 -> EXIT_FAILURE, 2 -> EXIT_TROUBLE.
842 * src/side.c: unsigned -> unsigned int.
845 unsigned -> unsigned int
851 * src/util.c: 2 -> EXIT_TROUBLE.
853 unsigned -> unsigned int
855 2002-01-24 Paul Eggert <eggert@twinsun.com>
861 * ABOUT-NLS, intl/*: Update to Gettext 0.11-pre5++.
869 * README-alpha: Move most of contents to INSTALLME.
873 config.guess, config.sub, depcomp, missing, install-sh, mkinstalldirs.
874 Move the following files here from doc: texinfo.tex, mdate-sh.
877 * config/config.rpath: New file, from Gettext 0.11-pre5++.
879 * configure.ac (AC_INIT): Use new 3-arg form.
885 * lib/gettext.h: New file, from Gettext 0.11-pre5++.
888 * m4/codeset.m4, m4/gettext.m4, glibc21.m4, iconv.m4, isc-posix.m4,
889 lcmessage.m4, progtest.m4: Upgrade to Gettext 0.11-pre5++.
890 * m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files, from
891 Gettext 0.11-pre5++.
894 * po/Makefile.in.in: Upgrade to Gettext 0.11-pre5++.
895 * po/Makevars, po/Rules-quot, po/boldquot.sed: New files,
896 from Gettext 0.11-pre5++.
909 instead of (uintmax_t) -1, to avoid warnings on some compilers.
949 (lines_differ): Have an explicit do-nothing case for
950 IGNORE_NO_WHITE_SPACE, to pacify gcc -Wall.
952 2001-12-29 Eli Zaretskii <eliz@is.elta.co.il>
963 2001-12-23 Paul Eggert <eggert@twinsun.com>
977 (longopts, option_help_msgid, main): Add --diff-program=PROGRAM.
987 system or fork+exec. Check for system returning -1.
991 (longopts, main, option_help_msgid): New option --diff-option=PROGRAM.
997 pclose returning -1.
1001 builder-settable. Do not prepend DIFF_OPTIONS.
1002 (check-stdout): If fclose (stdout) fails, print errno info.
1008 (diff3 Options, sdiff Options): Add --diff-program.
1026 (Reporting Bugs): Mention bug-report archive and test version
1027 location. Ask for "diff --version" in bug reports.
1029 2001-12-13 Paul Eggert <eggert@twinsun.com>
1039 2001-12-13 Eli Zaretskii <eliz@is.elta.co.il>
1051 top_srcdir-relative ones.
1055 2001-12-12 Neal H Walfield <neal@cs.uml.edu>
1060 2001-12-11 Paul Eggert <eggert@twinsun.com>
1062 * m4/Makefile.am.in: Remove jm-glibc-io.m4
1073 * doc/diff.texi: Add --no-ignore-file-name-case.
1102 HAVE_SETMODE -> HAVE_SETMODE_DOS.
1114 * src/cmp.c: Include <hard-locale.h>, <setmode.h>.
1122 allocate memory. Fix bug: -n was incorrectly ignored when optimizing
1128 * ms/config.bat: pc -> ms
1138 2001-12-10 Paul Eggert <eggert@twinsun.com>
1142 2001-12-03 Paul Eggert <eggert@twinsun.com>
1146 2001-12-03 Paul Eggert <eggert@twinsun.com>
1153 (Invoking cmp): New trailing operands FROM-SKIP and TO-SKIP.
1154 -i or --ignore-initial now accepts FROM-SKIP:TO-SKIP.
1155 New option -n or --bytes.
1168 HAVE_FORK -> HAVE_WORKING_FORK || HAVE_WORKING_VFORK.
1178 * sdiff.c (main): HAVE_VFORK -> HAVE_WORKING_VFORK.
1201 Add support for -n or --bytes.
1203 (option_help_msgid, main): Add -i M:N.
1205 (main): setmode -> set_binary_mode.
1210 2001-12-02 Paul Eggert <eggert@twinsun.com>
1212 * diff.c (main, compare_files): setmode -> set_binary_mode.
1216 * xstrtol.c (__xstrtol): Add support for IEC 60027-2.
1218 2001-11-25 Paul Eggert <eggert@twinsun.com>
1222 * README-alpha: New file.
1224 * src/Makefile.am (INCLUDES): Add -I../lib, for regex.h.
1234 * lib/Makefile.am (noinst_HEADERS): Add unlocked-io.h.
1241 * doc/diff.texi: offsets -> indices for cmp
1243 * src/cmp.c (option_help_msgid): offsets -> indices
1246 Don't mention --binary on POSIX hosts.
1249 (longopts, option_help_msgid, main): Add -E, --ignore-tab-expansion,
1250 --strip-trailing-cr.
1255 @code -> @command
1256 @samp -> @option
1257 GNU -> @sc{gnu}
1261 Document -E or --ignore-tab-expansion, --strip-trailing-cr,
1262 --ignore-file-name-case.
1264 cmp's -c or --print-chars option is now -b or --print-bytes.
1266 -p now implies ^[[:alpha:]$_].
1268 cmp -i is an alias for --ignore-initial
1269 Document --from-file, --to-file.
1305 int -> bool for booleans.
1306 int -> lin for line numbers.
1307 int -> size_t for sizes.
1308 Use angle-brackets when including quotesys.h.
1310 (message5): sizeof -> offsetof
1311 (begin_output): Invoke pr without -f.
1312 (lines_differ): Renamed from line_cmp, and return bool not 3-way int.
1324 int -> bool for booleans.
1325 int -> lin for line numbers.
1328 int -> bool for booleans.
1329 int -> lin for line numbers.
1330 Use angle-brackets when including getopt.h, quotesys.h.
1344 int -> lin for line numbers.
1347 int -> bool for booleans.
1348 int -> lin for line numbers.
1349 int -> size_t for sizes.
1350 Use angle-brackets when including cmpbuf.h.
1364 word-aligned.
1371 int -> lin for line numbers.
1375 (groups_letter_value): Don't use _tolower; it's locale-dependent.
1379 int -> lin for line numbers (or 'long' when that's more convenient).
1380 (print_ed_hunk): Fix bug when handling double-dot inserts.
1383 int -> bool for booleans.
1387 compare_names -> compare_names_for_qsort.
1397 int -> bool for booleans.
1398 int -> lin for line numbers.
1399 Use angle-brackets when including getopt.h, quotesys.h.
1404 Rename the following variables for consistency with user-visible
1417 However, use file2 as the common file if this is a 3-way diff,
1424 (read_diff): Always use --horizon-lines=100 rather than trying
1426 Do not pass --inhibit-hunk-merge.
1432 int -> bool for booleans.
1433 int -> lin for line numbers.
1443 Rename the following decls for consistency with user-visible
1468 aligned and this can help the compiler. buffered_chars -> buffered
1486 int -> bool for booleans.
1487 long -> off_t for line numbers.
1488 Use angle-brackets when including getopt.h, fnmatch.h, quotesys.h.
1489 Include error.h, exclude.h, freesoft.h, hard-locale.h, prepargs.h,
1494 Rename the following variables for consistency with user-visible
1518 (longopts, main, option_help_msgid): Add -E, --from-file, --to-file.
1528 error -> try_help when appropriate.
1529 -p now means ^[[:alpha:]$_], not ^[_a-zA-Z$].
1530 Ignore --inhibit-hunk-merge.
1532 Remove now-unnecessary casts.
1545 "write failed" -> "standard output on output failure.
1548 int -> lin for line numbers.
1559 int -> bool for booleans.
1560 long -> off_t for line numbers.
1561 Use angle-brackets when including cmpbuf.h, getopt.h.
1567 (long_options, option_help_msgid, main): -c --print-chars ->
1568 -b --print-bytes
1569 (check_stdout): "write failed" -> "standard output"
1578 Compiler now checks that buffers are word-aligned.
1583 int -> lin for line numbers.
1584 int -> bool for booleans.
1585 unsigned int -> size_t for sizes.
1586 Use angle-brackets when including cmpbuf.h.
1590 (discard_confusing_lines): unsigned int -> lin for values that
1594 (diff_2_files): no_details_flag & ~ignore_some_changes ->
1600 2001-11-23 Paul Eggert <eggert@twinsun.com>
1614 * lib/cmpbuf.h: Use prototypes instead of old-style functions.
1618 Use prototypes instead of old-style functions.
1623 2001-11-22 Paul Eggert <eggert@twinsun.com>
1626 Define filename_cmp as an object-like macro, not as a function-like
1671 2001-11-20 Paul Eggert <eggert@twinsun.com>
1675 2001-03-16 Paul Eggert <eggert@twinsun.com>
1680 2001-02-26 Paul Eggert <eggert@twinsun.com>
1684 2001-02-17 Paul Eggert <eggert@twinsun.com>
1688 2001-01-09 Paul Eggert <eggert@twinsun.com>
1715 2000-10-25 Paul Eggert <eggert@twinsun.com>
1717 * lib/hard-locale.c: New file.
1719 2000-02-05 Paul Eggert <eggert@twinsun.com>
1723 1999-07-06 Paul Eggert <eggert@twinsun.com>
1727 1998-12-11 Paul Eggert <eggert@twinsun.com>
1732 1998-09-15 Paul Eggert <eggert@twinsun.com>
1736 1998-09-14 Paul Eggert <eggert@twinsun.com>
1747 (diff_o): quote.o -> quotearg.o
1752 (diff3.o): DIFF_PROGRAM -> DEFAULT_DIFF_PROGRAM.
1756 (maintainer-clean): Renamed from realclean.
1758 Invoke install-info if needed.
1759 (install-strip): New rule.
1761 (stamp-h.in): Don't put the date into the timestamp.
1763 ($D.tar.gz): Compress with gzip -9.
1773 (--with-mvfs-stat-bug, --with-nfs-stat-bug): New options.
1802 (main): Check for -1, not EOF, when calling getopt_long.
1803 Report --ignore-initial value when complaining about it.
1804 Output copyright and free software info with -v.
1820 (longopts): Remove old aliases --file-label, --entire-new-file,
1821 --ascii, --print.
1822 (main): Check for -1, not EOF, when calling getopt_long.
1824 Report error if -l specified but pagination is not supported.
1825 Report error if -S is specified twice with conflicting values.
1826 Have --version conform to the new GNU standards.
1827 Add new --from-file, --to-file, --inhibit-hun,-merge options.
1829 Add casts to pacify gcc -Wall.
1859 * side.c (print_half_line): Add brackets to pacify GCC -Wall.
1875 Compare getopt_long result to -1, not EOF.
1876 -v conforms to new GNU standard.
1881 Translate not-found message before forking.
1905 Compare getopt_long result to -1, not EOF.
1906 -v now reports version according to new GNU standard.
1912 (read_diff): Invoke diff with --inhibit-hunk-merge.
1916 `memory exhausted' -> `Memory exhausted'
1919 (pc-clean): Remove *.exe
1930 * README: Add --with-mvfs-stat-bug, --with-nfs-stat-bug.
1939 * context.c: Fix spacing.
1941 * NEWS: Mention --from-file=FILE, --to-file=FILE, ed.
1951 1998-03-15 Paul Eggert <eggert@twinsun.com>
1958 1997-05-05 Paul Eggert <eggert@twinsun.com>
1993 (AC_CHECK_LIB): Check for -lintl.
2013 * diff.c (main): -D FOO now outputs `/* ! FOO */ instead of
2043 previous match; this is simpler than `- file->prefix_lines - 1'.
2051 (analyze_hunk): Fix off-by-1 line length bug.
2063 speeds up diff -i considerably on some hosts (e.g. Solaris 2.3).
2069 differs and -i is in force. Don't assume ISSPACE ('\n') is nonzero.
2125 (AC_OUTPUT): Add [date > stamp-h].
2129 (check, stamp-h.in, cmp.o, util.o): New targets.
2133 (distfiles): Add stamp-h.in.
2134 (clean): Clean stamp-h.
2192 (AC_CHECK_HEADERS): Remove now-redundant check for <string.h>.
2194 (AC_FUNC_MEMCHR, AC_FUNC_MEMCMP, AC_CHECK_FUNCS): Use special-purpose
2198 Default to autoconf-specified strings.
2201 (distfiles): Rename config.h.in->config.hin, install.sh->install-sh.
2204 * io.c (binary_file_p): Assume non-broken memchr.
2214 * io.c (find_and_hash_each_line): Fix inconsistencies with -b -w -i and
2219 (prepare_text_end): -B no longer ignores missing newlines.
2238 * dir.c (dir_sort): Prefer NAMLEN (p) to strlen (p->d_name).
2268 The following changes simplify porting to non-Posix environments.
2270 * diff.c (binary_I_O): New variable for --binary option.
2271 (main, usage, compare_files): Support --binary option.
2305 rely on promotion to make the old-style parameter type agree
2311 * Makefile.in (LDFLAGS): Remove -g. Change all link commands
2321 * diff.c (main): allow -pu.
2332 limit the worst-case cost to O(N**1.5 log N) at the price of
2336 (SNAKE_LIMIT): New macro; merely documents already-used number 20.
2343 * diff.c (long_options, main, usage): Add `--help'.
2353 * util.c (xmalloc, xrealloc): "virtual memory" -> "memory"
2357 (long_options, main, usage): Add `--help'.
2361 (long_options, main, usage): Add `--help'.
2365 word-at-a-time comparisons changed to `word'.
2366 (long_options, main, usage): Add `--help'.
2368 (main): Add `-v'. Send version number to stdout, not stderr.
2381 * cmp.c (main, usage, version_string): Add --version option.
2408 * cmp.c (main, usage, version_string): Add --version option.
2431 * system.h (S_IS{BLK,CHR,DIR,FIFO,REG,SOCK}): Fix defns if
2473 * Makefile.in (COMPILE): New defn, with proper -I options so that
2479 * diff.c (main, longopts): Add --line-format=FORMAT option.
2485 Remove the convention that last arg -1 signifies that the lines
2490 Use a faster test for the single-fwrite optimization.
2515 * Pervasive changes for portability to 64-bit hosts:
2526 (.c.o): Add -DHAVE_CONFIG_H.
2528 * analyze.c: (diag): Pacify `gcc -Wall' with a useless assignment.
2533 (file): Now a 2-element array; replaces `file1' and `file2'.
2538 (long_options): Now const. Add `--ignore-initial'.
2539 (usage): Sort options and add `--ignore-initial'.
2540 (main, cmp): Add `--ignore-initial' support.
2542 (main): `cmp - -' now succeeds.
2549 If 2nd file is "-", treat it first, in case stdin is closed.
2557 Do not assume sizeof(long) == 4; this isn't true on some 64-bit hosts.
2574 Leave its name "-" instead of changing it to "Standard Input";
2575 to test whether a file is stdin, we must compare its name to "-" instead
2592 whitespace -> white space. It now stands for whatever isspace yields.
2593 Add --ignore-initial.
2598 (process_diff): Pacify `gcc -Wall' with a useless assignment.
2608 instead of using one hardwired defn for -b and another for -w.
2627 (edit): Pacify `gcc -Wall' with a useless assignment.
2649 instead of using one hardwired defn for -b and another for -w.
2651 Pacify `gcc -Wall' be rewriting for-loop into do-while-loop.
2658 * Makefile.in (config.status): Run config.status --recheck, not
2664 with `[ TEST ] || ACTION || exit' so that the containing for-loop exits
2686 * analyze.c (diff_2_files): With -q, do not report that files differ
2698 * diff3.c (tab_align_flag): New variable, for new -T option.
2699 (main, usage, output_diff3): Add support for -T.
2724 * diff.c (main, longopts, usage): Add --horizon-lines option.
2726 with --horizon-lines determined by the first diff.
2749 * Makefile.in (.c.o): Add -I$(srcdir); put $(CFLAGS) last before $<.
2801 * Makefile.in (.c.o): Add -I.
2832 * diff.c (main): Add `-U lines' as an alias for `--unified=lines'.
2834 * diff3.c (usage): Add third --label option in example.
2842 * diff3.c (main, usage): Add -A or --show-all.
2843 -m now defaults to -A, not -E. Allow up to three -L options.
2846 Output ||||||| for -A. Distinguish between conflicts and overlaps.
2858 line numbers start with - file->prefix_lines, not 0.
2864 * io.c (binary_file_p): Consider empty file as non-binary.
2869 report bogus differences (for one of -mexEX3) just because the
2870 file0-file1 diffs don't line up with the file0-file2 diffs.
2871 (This is entirely possible since we don't use diff's -n
2877 (FC, FO): New macros; they replace FILE1, FILE0 for two-way diffs,
2878 to distinguish them from three-way diffs.
2884 object allocated; this saves an if-then-else.
2901 * diff.c (longopts, main): --{old,new,unchanged,changed}--group-format
2902 are new options, so that -D is no longer overloaded. Set
2903 no_diff_means_no_output if --unchanged-{line,group}-format allows it.
2912 * diff.c (main, usage): Replace --line-prefix with the more general
2913 --{old,new,unchanged}-line-format options.
2924 * diff.c (main): Add -E or --line-prefix option. Add -D'=xxx'
2925 for common lines. Change default -D< format from copy of -D>
2926 format to to -D<%<; similarly for default -D> format.
2930 Use it for -D'=xxx', -E.
2932 * context.c (find_hunk): Glue together two non-ignorable changes that
2949 * diff.c (main): Support new -D options for if-then-else formats.
2975 * Makefile.in: Include binprefix in -DDIFF_PROGRAM.
2992 (usage): Document -x, -X, --exclude, --exclude-from.
3002 * diff.h: (struct line_def): Replace this 3-word struct with char *.
3009 New member alloc_lines - linbuf_base replaces old linbufsize.
3023 (diff_2_files): When comparing files byte-by-byte for equality,
3027 Use only one buffer for stdin with `diff - -'.
3032 (main): Use them for the new --exclude and --exclude-from options.
3038 * dir.c (dir_sort): Support new --exclude* options.
3044 Make buckets realloc-able, since we can't preallocate them.
3048 Move prefix-handling code to find_identical_ends;
3053 needed. Work even if the buffers are the same (because of `diff - -').
3058 Don't copy stdin buffer if `diff - -'.
3064 Allocate a one-word sentinel to allow word-at-a-time prefix comparison.
3094 files as binary files. Allow about 1.5% non-printing
3108 * diff3: Add -v --version option.
3129 * diff.c (longopts): --unidirectional-new-file is like -P, not -N.
3130 Rename --file-label to --label (leave old name, but undocumented).
3134 * diff3.c (main, usage): Add long-named options.
3140 Thu Jun 25 16:59:47 1992 David J. MacKenzie (djm@apple-gunkies.gnu.ai.mit.edu)
3142 * diff.c: --reversed-ed -> --forward-ed.
3146 * analyze.c, diff.c, diff.h, io.c: For -y, compare even if same file.
3155 * diff.c (main): Set that for -P.
3156 (compare_files): Support -P, somewhat like -N.
3157 (longopts): Support long name for -P.
3161 * Makefile.in: Distribute diff.info-* too.
3167 * ifdef.c: Don't dump core if `diff -Dx f f'.
3187 Prefix long options with `--', not `+'.
3194 * context.c: Align context with tab if -T is given. Tune.
3197 * side.c: Don't expand tabs unless -t is given.
3199 * util.c: -w skips all white space. Remove lint. Tune.
3201 * sdiff.c: Support many more diff options, e.g. `-', `sdiff file dir'.
3212 Simplify --sdiff-merge-assist format.
3219 sdiff-style output format to diff.
3226 Fri Aug 2 12:22:30 1991 David J. MacKenzie (djm at apple-gunkies)
3231 Thu Aug 1 22:24:31 1991 David J. MacKenzie (djm at apple-gunkies)
3246 Don't not define const if __GNUC__ is defined -- that would
3247 break with -traditional.
3252 * configure, Makefile.in: $(INSTALLPROG) -> $(INSTALL).
3301 * diff.c: +print option renamed +paginate. Remove +all-text.
3331 right. This also generates an error when both -u and -c are
3368 * analyze.c (diff_2_files): No warnings about newlines for -D.
3374 * diff.c (compare_files): For -D, compare even args are same file.
3388 * diff.c (longopts): Add +new-files.
3396 (main): Handle +unidiff and -u.
3419 * Handle -L option.
3425 * diff3.c (main): Recognize -L instead of -t.
3427 * diff3.c (main): Support -m without other option.
3437 Pass -a to diff if given to diff3.
3443 (main): Compute rev_mapping here. Handle -a and -m.
3444 Error message if excess -t operands. Error for incompatible options.
3445 Error if `-' given more than once.
3462 * util.c (print_1_line): Change format of missing-newline msg.
3465 * io.c (slurp): Don't mention differences in final newline if -B.
3488 Tue Jul 31 21:37:16 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3493 Tue May 29 21:28:16 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3497 Mon Apr 16 18:31:05 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3503 Sun Mar 25 15:58:42 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3511 Sat Mar 24 14:02:51 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3520 Thu Mar 22 16:35:33 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3528 Fri Mar 16 00:33:08 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3530 * diff3.c (read_diff): Pass -- as first arg to diff.
3537 Sun Mar 11 17:10:32 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3539 * diff3.c (main): Accept -t options and pass to output_diff3_edscript.
3540 (usage): Mention -t.
3546 Tue Mar 6 22:37:20 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3552 Thu Mar 1 17:19:23 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3575 Fri Feb 2 23:21:38 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3577 * analyze.c (diff_2_files): If -B or -I, don't return 1
3586 * diff.c (usage): Mention -v.
3588 Wed Jan 10 16:06:38 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3593 Sun Dec 24 10:29:20 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3599 * diff.c (main): -v prints version number.
3603 Fri Nov 17 23:44:55 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3607 Thu Nov 16 13:51:10 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3611 * io.c (slurp): Null-terminate the buffer.
3625 Sat Nov 11 14:04:16 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3634 Fri Nov 3 15:27:47 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3636 * diff.c (usage): Mention -D.
3640 Sun Oct 29 16:41:07 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3644 Wed Oct 25 17:57:12 1989 Randy Smith (randy at apple-gunkies.ai.mit.edu)
3652 Wed Oct 25 15:05:49 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3656 Tue Oct 3 00:51:17 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3658 * diff3.c (process_diff, create_diff3_block): Init ->next field.
3660 Fri Sep 29 08:16:45 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3664 Wed Sep 20 00:12:37 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3669 Mon Sep 18 02:54:29 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3671 * Handle -D option:
3673 * diff.c (main): Handle -D option.
3674 (compare_files): Reject -D if files spec'd are directories.
3677 Fri Sep 1 20:15:50 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3681 Mon Aug 28 17:58:27 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3685 Wed Aug 23 17:48:47 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu)
3692 * analyze.c (diff_2_files): If -q, treat all files as binary.
3693 * diff.c (main): Detect -q, record in no_details_flag.
3695 Sun Jul 30 23:12:00 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3700 Wed Jul 26 02:02:19 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3702 * diff.c (main): Make -C imply -c.
3714 non-RCS modes don't want to be affected by these changes, they
3737 Wed May 17 20:18:43 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3743 Wed Apr 26 15:35:57 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3751 Wed Apr 12 01:10:27 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3756 Sat Apr 8 15:49:49 1989 Randall Smith (randy at apple-gunkies.ai.mit.edu)
3773 Fri Feb 24 10:01:58 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3779 Wed Feb 15 14:24:48 1989 Jay Fenlason (hack at apple-gunkies.ai.mit.edu)
3781 * diff3.c (message) Re-wrote routine to avoid using alloca()
3783 Wed Feb 15 06:19:14 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3787 Sun Feb 12 11:50:36 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3789 * io.c (slurp): ->bufsize is nominal amount we have room for;
3794 Fri Feb 10 01:28:15 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3796 * diff.c (main): -C now takes arg to specify context length.
3797 Now -p to show C function name--Damned IEEE!
3805 don't move past buffer-beg.
3813 Wed Jan 25 22:44:44 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3817 Sat Dec 17 14:12:06 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3820 provide default defns plus commented-put defns for sysV.
3822 Thu Nov 17 16:42:53 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3824 * dir.c (dir_sort): Open-trouble not fatal; just say # files is -1.
3829 Cross-propagate inf[i].dir_p sooner.
3831 Sun Nov 13 11:19:36 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu)
3877 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
3878 Boston, MA 02111-1307, USA.