summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* build: suppress warnings about bindtextdomain and textdomainJim Meyering2009-11-201-0/+6
| | | | * src/system.h (bindtextdomain, textdomain) [!ENABLE_NLS]: Define away.
* build: use more gnulib modulesJim Meyering2009-11-201-0/+4
| | | | | * bootstrap.conf (gnulib_modules): Add mktime, nanosleep, strptime and timegm.
* use xfreopen rather than freopenJim Meyering2009-11-204-7/+10
| | | | | | | | | * 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.
* build: enable many warningsJim Meyering2009-11-203-0/+84
| | | | | | * configure.ac: Add support for --enable-gcc-warnings. * bootstrap.conf (gnulib_modules): Add manywarnings. * Makefile.am (AM_CFLAGS): Add $(WARN_CFLAGS) $(WERROR_CFLAGS)
* build: update gnulib submodule to latestJim Meyering2009-11-201-0/+0
|
* maint: add an assertion to suppress clang-detected warningJim Meyering2009-11-201-2/+6
| | | | | | | | 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.
* maint: remove dead assignment from diff3.cJim Meyering2009-11-201-1/+0
| | | | * src/diff3.c (make_3way_diff): Remove dead assignment.
* build: update gnulib submodule to latestJim Meyering2009-11-181-0/+0
|
* maint: hide build commands behind $(AM_V_GEN)Jim Meyering2009-11-182-4/+6
| | | | | * 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.
* build: let automake generate better man-installation rulesJim Meyering2009-11-161-3/+3
| | | | | * man/Makefile.am (dist_man1_MANS): Rename from dist_man_MANS, to enable better automake-generated installation rules.
* admin: ignore all of gnulib-testsJim Meyering2009-11-161-0/+1
| | | | * .gitignore: Add gnulib-tests
* build: avoid link failure when libsigsegv is usedEric Blake2009-11-161-1/+1
| | | | * src/Makefile.am (LDADD): Link against LIBSIGSEGV.
* maint: define/use PROGRAM_NAME and AUTHORS; use propername moduleJim Meyering2009-11-166-12/+39
| | | | | | | | | | * 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".
* maint: no longer define *_FILENO constantsJim Meyering2009-11-161-9/+0
| | | | | * src/system.h (STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO): Remove definitions. Now guaranteed by gnulib.
* maint: bug-diffutils@gnu.org is the new bug-reporting addressJim Meyering2009-11-166-12/+17
| | | | | | | | | | | * 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.
* sdiff, diff3: exec diff, not $(bindir)/diffJim Meyering2009-11-163-1/+6
| | | | | | | | * 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.
* tests: add the first script; hook up gnulib-testsJim Meyering2009-11-147-4/+686
| | | | | | | | | | * 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.
* build: require gettext-0.17Jim Meyering2009-11-131-1/+1
| | | | * configure.ac: Require gettext-0.17; it was released two years ago.
* build: correct gettext configure-time supportJim Meyering2009-11-131-1/+1
| | | | | | | * 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
* build: generalize autoheader checkJim Meyering2009-11-121-1/+1
| | | | * bootstrap: Look for AC_CONFIG_HEADER as well as AC_CONFIG_HEADERS.
* maint: use a git submodule for gnulibJim Meyering2009-11-122-0/+3
| | | | | | * .gitmodules: New file, to track gnulib. * gnulib: New file, created by running this: git submodule add git://git.sv.gnu.org/gnulib.git gnulib
* maint: tell git what it can ignoreJim Meyering2009-11-121-0/+51
| | | | * .gitignore: Ignore generated files.
* build: generate ChangeLog (from git logs) into distribution tarballJim Meyering2009-11-112-0/+16
| | | | | | * Makefile.am (dist-hook, gen-ChangeLog): New rules. (gen_start_date): Define. * bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.
* admin: update all copyright notices to include the year 2009Jim Meyering2009-11-1139-60/+59
|
* maint/sc: enable the m4 quote checkJim Meyering2009-11-112-4/+3
| | | | | * m4/vararrays.m4 (AC_C_VARARRAYS): Quote AC_DEFINE argument. * cfg.mk (local-checks-to-skip): Add sc_m4_quote_check.
* build: rely on gnulib's progname moduleJim Meyering2009-11-117-21/+10
| | | | | | | | | | | | * 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.
* maint/sc: enable the space-TAB checkJim Meyering2009-11-113-32/+22
| | | | | | * 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.
* build: rely on gnulib's mbrtowc moduleJim Meyering2009-11-113-8/+1
| | | | | | | * 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.
* maint/sc: enable check for unmarked diagnosticsJim Meyering2009-11-112-3/+2
| | | | | * cfg.mk (local-checks-to-skip): Remove sc_unmarked_diagnostics. * src/dir.c (diff_dirs): Mark a diagnostic for translation.
* maint/sc: enable two config.h-checking rulesJim Meyering2009-11-111-2/+4
| | | | | | * cfg.mk (local-checks-to-skip): Remove sc_require_config_h and sc_require_config_h_first. (config_h_header): Define.
* maint/sc: enable the po checkJim Meyering2009-11-112-4/+4
| | | | | * cfg.mk (local-checks-to-skip): Add sc_po_check. * po/POTFILES.in: Update.
* maint/sc: use STREQ, not strcmp(a,b) == 0Jim Meyering2009-11-116-9/+10
| | | | | | | | | | | | | 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.
* maint/sc: enforce "file system" spellingJim Meyering2009-11-113-6/+5
| | | | | | * src/system.h: Spell it as two words, not one. * ms/config.sed: Likewise. * cfg.mk (local-checks-to-skip): Remove sc_file_system.
* maint/sc: enable check for CVS keyword expansionJim Meyering2009-11-112-2/+0
| | | | | * doc/diff.texi: Remove $Id$. * cfg.mk (local-checks-to-skip): Remove sc_prohibit_cvs_keyword.
* maint: record previous versionJim Meyering2009-11-111-0/+1
| | | | * .prev-version: New file.
* maint/sc: enable check for duplicate "the"; fix oneJim Meyering2009-11-112-8/+13
| | | | | | | * 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.
* maint/sc: remove cast of xmalloc return valueJim Meyering2009-11-112-2/+1
| | | | | * lib/prepargs.c (prepend_default_options): Remove useless cast. * cfg.mk (local-checks-to-skip): Remove sc_cast_of_x_alloc_return_value.
* maint: rename ChangeLog to ChangeLog-2008Jim Meyering2009-11-112-2/+2
| | | | | | * ChangeLog-2008: Rename from ChangeLog. * Makefile.am (EXTRA_DIST): Add ChangeLog-2008. * .gitignore: Ignore ChangeLog.
* maint/sc: remove useless if-before-free testsJim Meyering2009-11-113-9/+4
| | | | | | * 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.
* maint: require newer automake, new non-major version string, dist-xzJim Meyering2009-11-111-3/+8
| | | | | | | * 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.
* build: update build/release infrastructureJim Meyering2009-11-115-153/+499
| | | | | | | | | | | | * 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.
* * doc/diff.texi: Update Back-Cover text to reflect new GNU wording.Paul Eggert2009-11-112-3/+7
|
* * src/side.c [!HAVE_MBRTOWC]: Supply defns for mbstate_t and mbrtowc.Paul Eggert2009-11-112-0/+12
| | | | Problem reported by Bruno Haible.
* * src/side.c (print_half_line): Don't convert to unsigned charPaul Eggert2009-11-112-1/+4
| | | | unnecessarily.
* Don't mishandle multibyte characters in side-by-side format.Paul Eggert2009-11-113-7/+58
| | | | | | | | | | | 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>.
* * NEWS: New diff option --suppress-blank-empty (no longer -u default).Paul Eggert2009-11-117-15/+79
| | | | | | | | | | | | * 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.
* * configure.ac: Invoke gl_USE_SYSTEM_EXTENSIONS after gl_EARLY,Paul Eggert2009-11-112-1/+4
| | | | since gnulib now requires this order.
* * bootstrap: Import from gnulib.Paul Eggert2009-11-112-59/+97
|
* Fix typo in previous change; Bruno wrote the code.Paul Eggert2009-11-111-1/+1
|
* Break out diffseq.h into a separate file, so that gettext can usePaul Eggert2009-11-113-344/+36
| | | | | | | | | | | 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.