summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* * doc/diff.texi (Copying This Manual): Adjust to new fdl.texi layout.Paul Eggert2009-11-112-5/+2
|
* * src/diff.c (compare_files): Use last_component rather than base_name,Paul Eggert2009-11-114-7/+16
| | | | | | adjusting to gnulib API change. This avoids a memory leak. * src/sdiff.c (expand_name): Likewise. * src/util.c (dir_file_pathname): Likewise.
* * doc/diff.texi (White Space): Note that newline always ends a line,Paul Eggert2009-11-112-1/+11
| | | | | so -w doesn't ignore newline-related changes. Problem reported by David Kastrup.
* remove many filesJim Meyering2009-11-1154-6324/+0
| | | | | Many are now obtained via bootstrap from gnulib. Others (ms/) were not being maintained.
* * COPYING: New file.Paul Eggert2007-07-1938-274/+916
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * AUTHORS: Update from GPLv2 to GPLv3. * Makefile.am: Likewise. * NEWS: Likewise. * README: Likewise. * README-hacking: Likewise. * bootstrap: Likewise. * bootstrap.conf: Likewise. * configure.ac: Likewise. * exgettext: Likewise. * doc/Makefile.am: Likewise. * lib/Makefile.am: Likewise. * lib/cmpbuf.c: Likewise. * lib/cmpbuf.h: Likewise. * lib/prepargs.c: Likewise. * m4/vararrays.m4: Likewise. * man/Makefile.am: Likewise. * ms/Makefile.am: Likewise. * ms/README: Likewise. * ms/config.bat: Likewise. * ms/config.sed: Likewise. * ms/config.site: Likewise. * po/POTFILES.in: Likewise. * src/Makefile.am: Likewise. * src/analyze.c: Likewise. * src/cmp.c: Likewise. * src/context.c: Likewise. * src/diff.c: Likewise. * src/diff.h: Likewise. * src/diff3.c: Likewise. * src/dir.c: Likewise. * src/ed.c: Likewise. * src/io.c: Likewise. * src/normal.c: Likewise. * src/sdiff.c: Likewise. * src/system.h: Likewise. * src/util.c: Likewise.
* * src/ifdef.c: Fix typo: "GNU DIFF General Public License" should bePaul Eggert2007-07-193-4/+10
| | | | | "GNU General Public License". Reported by Erich Guenther. * src/side.c: Likewise.
* (print_context_label): Use TYPE_IS_INTEGER macro rather than rollingPaul Eggert2007-06-181-1/+1
| | | | it ourselves.
* * bootstrap.conf (gnulib_modules): Add inttypes.Paul Eggert2007-06-182-2/+3
|
* * src/context.c (print_context_label): Don't assume that time_tPaul Eggert2007-06-182-3/+24
| | | | | | fits in long int, since it doesn't in FreeBSD/arm. Problem reported by Xin Li in <http://lists.gnu.org/archive/html/bug-gnu-utils/2007-06/msg00091.html>.
* * NEWS: Mention new sdiff aliases 1 and 2 for l and r.Paul Eggert2007-06-064-11/+25
| | | | | | * doc/diff.texi (Merge Commands): Likewise. * src/sdiff.c (give_help): Give help for them. (edit): Support them.
* * doc/diff.texi (Detailed diff3 Normal): "range is a singleton" ->Paul Eggert2007-04-122-1/+6
| | | | "there is only one line", for clarity. Suggested by Jerry Peek.
* * TODO: Mention possible sdiff improvement.Paul Eggert2007-04-042-0/+5
|
* * bootstrap: Sync from gnulib.Paul Eggert2007-04-048-144/+356
| | | | | | | | | | * src/cmp.c: Don't include exit.h; no longer needed. * src/diff.c: Likewise. * src/sdiff.c: Likewise. * src/dir.c: Don't include strcase.h; no longer needed. * README-alpha: Remove, replacing with: * README-hacking: New file, taken from coreutils with some changes. The rename is required by the change to 'bootstrap'.
* * src/analyze.c (build_reverse_script): Fix typo in comment.Paul Eggert2006-11-152-1/+6
| | | | Problem and fix reported by Daniel Hipschman.
* * src/sdiff.c (sigprocmask): Don't dump core if O is null.Paul Eggert2006-11-142-1/+2
|
* Don't assume SIGPIPE exists, and that sigblock and sigsetmaskPaul Eggert2006-11-143-4/+25
| | | | | | | | | | | exist if sigprocmask does not. Problem reported by Paul Edwards for MVS 3.8. * configure.ac (sigblock): Check whether this function is available, if sigprocmask is not. * src/sdiff.c (sigs): Omit SIGPIPE if it's not defined. Put SIGINT last; all uses changed. (handler_index_of_SIGPIPE): Omit if SIGPIPE is not defined. (sigblock, sigsetmask) [!HAVE_SIGBLOCK]: New macros.
* * src/sdiff.c (sigprocmask) [! HAVE_SIGPROCMASK]: Cast 2nd arg toPaul Eggert2006-11-052-1/+9
| | | | | sigset_t *, since it might be a literal 0. Problem reported by Paul Edwards for MVS 3.8.
* * NEWS: diff -u no longer outputs trailing white space unless thePaul Eggert2006-09-052-3/+7
| | | | input data has it.
* Modernize bootstrap procedure to match current gnulib.Paul Eggert2006-09-0510-280/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bootstrap: Sync with coreutils bootstrap, except check that the directory build-aux exists before trying to copy to it. * bootstrap.conf: New file. (gnulib_modules): Add config-h, dup2, extensions, fcntl, fdl, stat-macros, unistd. * configure.ac: Invoke gl_EARLY and gl_INIT rather than GNULIB_AUTOCONF_SNIPPET. (AC_CONFIG_HEADER): Rename config.h to lib/config.h. (AC_CHECK_HEADERS_ONCE): Don't check for fcntl.h, locale.h, sys/file.h, unistd.h. We now use the fcntl and unistd modules, and locale.h can be assumed for any C89 compiler. (DIFFUTILS_PREREQUISITES): Remove. No longer needed now that we use the stdint module. (AC_CHECK_FUNCS_ONCE): Remove dup2, which is no longer needed now that we use the dup2 module. (AM_GNU_GETTEXT): Use need-formatstring-macros, and ... (AM_GNU_GETTEXT_VERSION): specify version 0.15 instead of 0.14.5, to be consistent with coreutils. * lib/Makefile.am (noinst_LIBRARIES): (lib_SOURCES, libdiffutils_a_LIBADD): (libdiffutils_a_DEPENDENCIES, BUILT_SOURCES, EXTRA_DIST): (MOSTLYCLEANFILES): Remove; now computed automatically. (noinst_HEADERS, libdiffutils_a_SOURCES): Just append our special files now. * lib/cmpbuf.c: Include config.h unconditionally, since we no longer define HAVE_CONFIG_H. * lib/prepargs.c: Likewise. * src/Makefile.am (LDADD): Use $(LIBINTL), not @LIBINTL@. (diff_LDADD): Use $(LIB_CLOCK_GETTIME), not @LIB_CLOCK_GETTIME@. * src/dir.c (dir_read): Use _D_EXACT_NAMLEN, not NAMELEN. * src/system.h (volatile): Remove, since we assume C89 or better. Include stat-macros.h. (S_IRWXU, S_IRWXG, S_IRWXO, S_IRUSR, S_IWUSR): Remove, since we now use stat-macros.h. (SEEK_SET, SEEK_CUR): Remove, since we assume C89 or better. Include unistd.h unconditionally, since we use unistd. Likewise for fcntl.h. (dup2): Remove, since we now use dup2. (O_RDONLY, O_RWDR, O_BINARY): Remove, since we now use fcntl. Include dirent.h unconditionally. (NAMLEN): Remove, replacing with.... (_D_EXACT_NAMLEN): New macro. Include inttypes.h unconditionally. (PTRDIFF_MAX, SIZE_MAX, UINTMAX_MAX, strtoumax): Remove, since we now use inttypes. Include locale.h unconditionally. (setlocale): Remove, since we now assume locale.h.
* * doc/diff.texi (Detailed Unified): Don't output trailing whitePaul Eggert2006-09-052-3/+6
| | | | | space unless the input data has it. * src/context.c (pr_unidiff_hunk): Likewise.
* * src/context.c (print_context_function): Do not printPaul Eggert2006-09-052-0/+7
| | | | trailing white space in a context header.
* (cmp Options): -l also outputs the EOF message.Paul Eggert2006-07-261-0/+1
|
* * src/cmp.c (cmp): The previous fix wasn't quite right either, asPaul Eggert2006-05-092-6/+14
| | | | | | it mishandled 'cmp A B >/dev/null' when A is shorter than B and differs before A's end-of-file, by outputting a bogus EOF message. Also, it was inefficient if A and B were large.
* Use Jim's wording in ChangeLog entry, mostly.Paul Eggert2006-05-081-3/+4
|
* Correct authorship of previous patch.Paul Eggert2006-05-081-2/+4
|
* * src/cmp.c (cmp): Fix bug introduced in 2006-03-09 change.Paul Eggert2006-05-082-2/+6
| | | | | For example, "cmp <(echo b) <(echo a) > /dev/null" incorrectly succeeded. Problem reported by Jim Meyering.
* * src/context.c (pr_context_hunk, pr_unidiff_hunk):Paul Eggert2006-05-075-34/+47
| | | | | | | | | | | | | Prefer fputs or fputc to fprintf, since it's a tad more efficient with unlocked-IO on glibc. Long ago we avoided fputs to work around an ancient SunOS bug, but that's no longer relevant. * src/diff3.c (output_diff3, dotlines, undotlines): (output_diff3_edscript, output_diff3_merge): Likewise. This also avoids a gcc -Wformat-security warning reported by Jim Meyering. * src/ed.c (print_ed_hunk, print_forward_ed_hunk, print_rcs_hunk): Likewise. * src/normal.c (print_normal_hunk): Likewise.
* find_identical_ends and doc/diff.texi fixesPaul Eggert2006-05-071-0/+11
|
* (find_identical_ends): Fix huge performance bug that IPaul Eggert2006-05-071-2/+3
| | | | | | | | introduced in the 2001-11-25 change: the code to remove the identical suffix also looked at the trailing sentinel, which meant the common suffix length was always incorrectly calculated to be zero. Problem and fix reported by Daniel Hipschman. Instead of his fix, revert to the (nearly-equivalent) pre-2001 code.
* Switch from GFDL 1.1 to 1.2.Paul Eggert2006-05-071-1/+1
|
* * src/system.h (PARAMS, PROTOTYPES): Remove; no longer needed.Paul Eggert2006-03-137-27/+37
| | | | | | | | | (IF_LINT): New macro, to pacify GCC. * src/analyze.c (diag, compareseq): Use IF_LINT. * src/cmp.c (cmp): Likewise. * src/diff3.c (process_diff): Likewise. Also, prefer NULL to 0. * src/ifdef.c (do_printf_spec, scan_char_literal): Likewise. * src/sdiff.c (edit): Likewise.
* Update code comment to match previous patch.Paul Eggert2006-03-091-1/+2
|
* (main): Avoid an unnecessary system call introduced in previous patch.Paul Eggert2006-03-091-6/+1
|
* * src/cmp.c (type_no_stdout): New constant.Paul Eggert2006-03-092-2/+18
| | | | | (main): Use it to avoid bug when the "EOF on foo" message is generated and stdout is /dev/null.
* Handle gettext.m4 like glibc21.m4. Don't remove po/en.po.Paul Eggert2006-01-052-3/+3
|
* Update FSF address.Paul Eggert2006-01-0534-50/+52
|
* Describe CVS access better, using the README-alpha from GNU tar.Paul Eggert2006-01-051-0/+67
|
* * src/cmp.c: Don't include <setmode.h>.Paul Eggert2006-01-0526-1426/+741
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (specify_ignore_initial): Reword to avoid gcc -W warnings. (main): Use freopen instead of setmode, since freopen is in POSIX. * src/context.c: Revert most 2004-09-01 changes. Then: (TIMESPEC_NS): Remove. All uses replaced by get_stat_mtime_ns. Include stat-time.h, strftime.h. (nstrtime): Remove decl. * src/diff.c: Revert most 2004-09-01 changes. Then: Don't include <posixver.h>, <quotesys.h>, <setmode.h>. Include <sh-quote.h>, <stat-time.h>, <timespec.h>. All uses of quotesys replaced by sh-quote. (main, compare_files): Use freopen instead of setmode, since freopen is in POSIX. (main): Don't complain about "diff -NUM'. (main, set_mtime_to_now): Adjust to stat-time.h macros when accessing nanoseconds. * src/diff3.c: Include sh-quote.h rather than quotesys. All uses changed. * src/dir.c (dir_read): excluded_filename renamed to excluded_file_name. * src/io.c: Don't include <setmode.h>. (sip, read_files): Remove binary file stuff, leaving a FIXME behind. A DOS expert needs to look at this. * src/diff.c: Include sh-quote.h rather than quotesys.h. All uses changed. * src/system.h: Include verify.h. (verify): Remove. All uses changed to verify.h version. Include <intprops.h>. (TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Remove. Now uses intprops.h versions. (O_BINARY): New defns, taken from coreutils. * src/util.c: Include sh-quote.h rather than quotesys.h. All uses changed.
* (recursive, new_file, unidirectional_new_file,Paul Eggert2004-09-011-273/+271
| | | | | | | | | | | | | | | | report_identical_files): Move into struct diffopt. All uses changed. (exclude_options, compare_files, specify_style, check_stdout): New arg OPT. All uses changed. (GDIFF_MAIN): Remove. All uses removed. (function_regexp_list, ignore_regexp_list): No longer static; now locals in 'main'. (main): Set opt.function_regexp, opt.ignore_regexp if using regexps; all other code now tests these pointers rather than inspecting fastmap internals. New local OPT to hold former statics; initialize it. (init_regexp_list): New function, used by main. (summarize_regexp_list): Now returns struct re_pattern_buffer *, and assumes reglist->regexps is not NULL. All uses changed.
* (find_function_last_search): Move into struct diffopt.Paul Eggert2004-09-011-91/+98
| | | | | | | | | All uses changed. (pr_context_label, pr_context_header, print_context_script, find_function, find_hunk, mark_ignorable, pr_context_hunk, pr_unidiff_hunk): New arg OPT. All uses changed. (print_context_number_range, print_unidiff_number_range): New arg OUT. All uses changed.
* Add AC_C_INLINE.Paul Eggert2004-09-011-0/+1
|
* (print_ed_hunk): Optimize the case where an insert'sPaul Eggert2004-07-211-5/+15
| | | | last line is a single-dot line.
* Initial revisionPaul Eggert2004-07-211-0/+3883
|
* Don't include <stdbool.h>, since setmode.h now does this.Paul Eggert2004-06-301-24/+10
| | | | | Include setmode.h first, to catch interface errors. Assume HAVE_SETMODE_DOS is defined.
* Include stdbool.h.Paul Eggert2004-06-301-0/+2
|
* Don't remove po/en.po.Paul Eggert2004-04-261-1/+1
|
* Don't generate a temporary file, as this runs afoul of "make distcheck"Paul Eggert2004-04-131-12/+4
| | | | which operates with read-only directories.
* (EXTRA_DIST): Add bootstrap.Paul Eggert2004-04-131-2/+2
| | | | Remove config/config.rpath as it is deduced automatically these days.
* Version 2.8.7.v2.8.7Paul Eggert2004-04-131-0/+2
|
* (AM_GNU_GETTEXT_VERSION): Add.Paul Eggert2004-04-131-1/+3
| | | | | | (XGETTEXT): Restore from pre-2004-04-12 version. This fixes a bug that lost many msgids in doc/diffutils.pot. (AC_INIT): Version 2.8.7.
View Lorry Controller Status