| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
| |
* src/system.h (bindtextdomain, textdomain) [!ENABLE_NLS]: Define away.
|
|
|
|
|
| |
* bootstrap.conf (gnulib_modules): Add mktime, nanosleep, strptime
and timegm.
|
|
|
|
|
|
|
|
|
| |
* src/cmp.c: Include "xfreopen.h".
Use xfreopen in place of freopen.
* src/diff.c Likewise, and...
(main): Set exit_failure to EXIT_TROUBLE, rather than to 2.
* src/diff3.c: Likewise.
* bootstrap.conf (gnulib_modules): Add xfreopen.
|
|
|
|
|
|
| |
* configure.ac: Add support for --enable-gcc-warnings.
* bootstrap.conf (gnulib_modules): Add manywarnings.
* Makefile.am (AM_CFLAGS): Add $(WARN_CFLAGS) $(WERROR_CFLAGS)
|
| |
|
|
|
|
|
|
|
|
| |
The clang static analyzer reported that a NULL parent could be
dereferenced. However, that cannot happen, because for all callers,
the parameter, parent, is always non-NULL at that point.
* src/diff.c: Include <assert.h>.
Assert that parent is not NULL.
|
|
|
|
| |
* src/diff3.c (make_3way_diff): Remove dead assignment.
|
| |
|
|
|
|
|
| |
* src/Makefile.am (paths.h): Use $(AM_V_GEN), and split a long line.
* man/Makefile.am ($(dist_man1_MANS)): Use $(AM_V_GEN) here, too.
|
|
|
|
|
| |
* man/Makefile.am (dist_man1_MANS): Rename from dist_man_MANS,
to enable better automake-generated installation rules.
|
|
|
|
| |
* .gitignore: Add gnulib-tests
|
|
|
|
| |
* src/Makefile.am (LDADD): Link against LIBSIGSEGV.
|
|
|
|
|
|
|
|
|
|
| |
* bootstrap.conf (gnulib_modules): Add propername.
* src/cmp.c (PROGRAM_NAME, AUTHORS): Define.
(main): Use them in use of version_etc.
* src/diff.c (PROGRAM_NAME, AUTHORS, main): Likewise.
* src/diff3.c (PROGRAM_NAME, AUTHORS, main): Likewise.
* src/sdiff.c (PROGRAM_NAME, AUTHORS, main): Likewise.
* src/system.h: Include "propername.h".
|
|
|
|
|
| |
* src/system.h (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO):
Remove definitions. Now guaranteed by gnulib.
|
|
|
|
|
|
|
|
|
|
|
| |
* configure.ac (AC_INIT): Use bug-diffutils@..., not bug-gnu-utils
as the bug-reporting address.
* NEWS (Administrivia): Mention this.
* src/cmp.c (usage): Remove hard-coded address.
Instead, use gnulib's emit_bug_reporting_address function.
* src/diff.c (usage, option_help_msgid): Likewise.
* src/diff3.c (usage): Likewise.
* src/sdiff.c (usage): Likewise.
|
|
|
|
|
|
|
|
| |
* src/Makefile.am (paths.h): Emit a definition of DEFAULT_DIFF_PROGRAM
that is simply "diff" (or whatever $(transform) would convert that to,
e.g., "gdiff"). This makes it so that tests can work without first
installing diff, and so that the binaries do not hard-code $(prefix).
* NEWS (Changes in behavior): Mention this.
|
|
|
|
|
|
|
|
|
|
| |
* configure.ac (AC_CONFIG_FILES): Add tests/Makefile and
gnulib-tests/Makefile.
* tests/help-version: New file, from coreutils.
* tests/test-lib.sh: Likewise.
* tests/Makefile.am: New file, from gzip.
* Makefile.am (SUBDIRS): Add tests and gnulib-tests.
* tests/t-local.sh: New, empty(for now) file.
|
|
|
|
| |
* configure.ac: Require gettext-0.17; it was released two years ago.
|
|
|
|
|
|
|
| |
* configure.ac: Use AM_GNU_GETTEXT([external], [need-ngettext]),
rather than AM_GNU_GETTEXT([external], [need-formatstring-macros]).
Reported by Martin Jacobs in
http://thread.gmane.org/gmane.comp.parsers.bison.bugs/3181
|
|
|
|
| |
* bootstrap: Look for AC_CONFIG_HEADER as well as AC_CONFIG_HEADERS.
|
|
|
|
|
|
| |
* .gitmodules: New file, to track gnulib.
* gnulib: New file, created by running this:
git submodule add git://git.sv.gnu.org/gnulib.git gnulib
|
|
|
|
| |
* .gitignore: Ignore generated files.
|
|
|
|
|
|
| |
* Makefile.am (dist-hook, gen-ChangeLog): New rules.
(gen_start_date): Define.
* bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.
|
| |
|
|
|
|
|
| |
* m4/vararrays.m4 (AC_C_VARARRAYS): Quote AC_DEFINE argument.
* cfg.mk (local-checks-to-skip): Add sc_m4_quote_check.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* bootstrap.conf (gnulib_modules): Add progname.
* cfg.mk (local-checks-to-skip): Add sc_program_name.
* src/cmp.c: Include progname.h.
(program_name): Remove declaration.
(main): Call set_program_name.
* src/diff.c (main): Likewise.
* src/diff3.c (main): Likewise.
* src/sdiff.c (main): Likewise.
* src/diff.h (program_name): Remove extern declaration.
|
|
|
|
|
|
| |
* doc/diagmeet.note: Use no TABs.
* ms/config.sed: Use TAB-space, not space-TAB in [].
* cfg.mk (local-checks-to-skip): Remove sc_space_tab.
|
|
|
|
|
|
|
| |
* bootstrap.conf (gnulib_modules): Add mbrtowc.
* src/side.c [!HAVE_MBRTOWC]: Remove now-useless code,
since gnulib guarantees working <wchar.h> and mbrtowc.
* cfg.mk (local-checks-to-skip): Remove sc_prohibit_HAVE_MBRTOWC.
|
|
|
|
|
| |
* cfg.mk (local-checks-to-skip): Remove sc_unmarked_diagnostics.
* src/dir.c (diff_dirs): Mark a diagnostic for translation.
|
|
|
|
|
|
| |
* cfg.mk (local-checks-to-skip): Remove sc_require_config_h and
sc_require_config_h_first.
(config_h_header): Define.
|
|
|
|
|
| |
* cfg.mk (local-checks-to-skip): Add sc_po_check.
* po/POTFILES.in: Update.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Run this command:
git grep -l 'strcmp *([^=]*== *0'|xargs \
perl -pi -e 's/\bstrcmp( *\(.*?\)) *== *0/STREQ$1/g'
and then add the new definition.
* src/system.h (STREQ): Define.
* src/cmp.c (main): Use STREQ, not strcmp.
* src/diff.c (main, compare_files): Likewise.
* src/diff3.c (main): Likewise.
* src/sdiff.c (expand_name): Likewise.
* cfg.mk (local-checks-to-skip): Add sc_prohibit_strcmp.
|
|
|
|
|
|
| |
* src/system.h: Spell it as two words, not one.
* ms/config.sed: Likewise.
* cfg.mk (local-checks-to-skip): Remove sc_file_system.
|
|
|
|
|
| |
* doc/diff.texi: Remove $Id$.
* cfg.mk (local-checks-to-skip): Remove sc_prohibit_cvs_keyword.
|
|
|
|
| |
* .prev-version: New file.
|
|
|
|
|
|
|
| |
* NEWS: s/the the/the/.
Adjust style to fit what some of the hooks and release tools expect.
* cfg.mk (local-checks-to-skip): Remove sc_the_the.
(old_NEWS_hash): Update.
|
|
|
|
|
| |
* lib/prepargs.c (prepend_default_options): Remove useless cast.
* cfg.mk (local-checks-to-skip): Remove sc_cast_of_x_alloc_return_value.
|
|
|
|
|
|
| |
* ChangeLog-2008: Rename from ChangeLog.
* Makefile.am (EXTRA_DIST): Add ChangeLog-2008.
* .gitignore: Ignore ChangeLog.
|
|
|
|
|
|
| |
* src/diff.c (compare-files): Remove useless if stmts.
* src/dir.c (diff_dirs): Likewise.
* cfg.mk (local-checks-to-skip): Remove sc_avoid_if_before_free.
|
|
|
|
|
|
|
| |
* configure.ac: Drop -cvs suffix. Switch to git-based format.
Distribute xz-compressed tarballs, too.
Require automake-1.11.
Enable automake's --enable-silent-rules option.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* bootstrap: Update from gnulib.
* bootstrap.conf (gnulib-modules): Add do-release-commit-and-tag,
git-version-gen, gnu-make, gnu-web-doc-update, gnumakefile, gnupload,
maintainer-makefile, update-copyright.
* gnulib-tests/Makefile.am: New file.
* cfg.mk: New file.
(local-checks-to-skip): List currently-failing tests,
so that "syntax-check" passes initially.
(manual_title): Define.
|
| |
|
|
|
|
| |
Problem reported by Bruno Haible.
|
|
|
|
| |
unnecessarily.
|
|
|
|
|
|
|
|
|
|
|
| |
Problem reported by Erik Karlsson in
<http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00030.html>.
* bootstrap.conf (gnulib_modules): Add wcwidth.
* src/side.c: Include <wchar.h>.
(print_half_line): Compute number of bytes and print widths of
multibyte characters. Inspired by an alternative solution from
Bruno Haible in
<http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00032.html>.
|
|
|
|
|
|
|
|
|
|
|
|
| |
* doc/diff.texi (Detailed Unified): Trailing spaces are no longer
omitted.
(Trailing Blanks): New section.
(diff Options) Mention new option.
* src/diff.h (suppress_blank_entry): New decl.
* src/context.c (pr_unidiff_hunk): Support --suppress-blank-empty.
* src/util.c (print_1_line): Likewise.
* src/diff.c (longopts, main, option_help_msgid): Likewise.
(SUPPRESS_BLANK_EMPTY_OPTION): New constant.
|
|
|
|
| |
since gnulib now requires this order.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
this code. Idea from Bruno Haible.
* bootstrap.conf (gnulib_modules): Add diffseq.
* src/analyze.c (xvec, yvec, fdiag, bdiag, too_expensive, SNAKE_LIMIT):
(struct partition, diag, compareseq): Remove; now in diffseq.h.
(ELEMENT, EQUAL, OFFSET, EXTRA_CONTEXT_FIELDS, NOTE_DELETE, NOTE_INSERT):
(USE_HEURISTIC): New macros.
Include "diffseq.h".
(diff_2_files): Rewrite to use new diffseq.h interface.
|