summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* build: use largefile module and update to latest gnulibJim Meyering2011-08-103-1/+1
| | | | | | * configure.ac: Remove AC_SYS_LARGEFILE, subsumed by ... * bootstrap.conf (gnulib_modules): ...this. Use largefile module. * gnulib: Update to latest.
* doc: insert comma in --help line for --ignore-space-change (-b)Santiago Vila2011-08-081-1/+1
| | | | | * src/diff.c (option_help_msgid): Insert omitted comma between "-b" and "--ignore-space-change". (tiny change)
* doc: relax restriction on front-cover and back-cover textsJim Meyering2011-08-041-8/+3
| | | | | | | * doc/diffutils.texi (copying): Relax restriction on front-cover and back-cover texts (just as m4 did here: http://git.savannah.gnu.org/cgit/m4.git/commit?id=ee1e92ec). Reported by Santiago Vila. Fix suggested by Eric Blake.
* tests: update init.sh from gnulibJim Meyering2011-08-031-53/+122
| | | | * tests/init.sh: Update from gnulib.
* build: update gnulib submodule to latestJim Meyering2011-08-031-0/+0
|
* maint: remove inclusion of unused header, for "make syntax-check"Jim Meyering2011-07-032-2/+0
| | | | | * src/diff3.c: Don't include <inttostr.h>. Not used. * src/context.c: Likewise.
* build: don't require perl when building from a tarballJim Meyering2011-06-192-4/+17
| | | | | | | | | | | | | But do ensure -- in all other circumstances -- that the man/*.1 files are rebuilt whenever the version number changes. * configure.ac (SRC_VERSION_C): Define. * man/Makefile.am (dist_man1_MANS): Rename from $(man1_MANS), so that we distribute those pesky man/*.1 files. (EXTRA_DIST): Reflect name change. (MAINTAINERCLEANFILES): Define this, not DISTCLEANFILES, now that these generated files are distributed. ($(dist_man1_MANS)): Depend on $(SRC_VERSION_C), so we get the full dependency when not building from a tarball.
* doc: do not distribute generated man/*.1 man filesJim Meyering2011-06-132-10/+677
| | | | | | | | | | * man/help2man: New file. * man/Makefile.am: Use $(srcdir)/help2man. Convert $(dist_man1_MANS) to $(man1_MANS), to tell automake not to distribute the generated man/*.1 files. Now they're generated at build-from-tarball time. ($(man1_MANS)): Depend on version.c, so that man pages are regenerated whenever the version string changes.
* build: ccache works better without embedded version stringsJim Meyering2011-06-137-4/+28
| | | | | | | | | | | | | * src/Makefile.am: Generate version.c and version.h and put the new symbol in a tiny library to be used by each program. (LDADD): Add the new library. * src/cmp.c (main): Use Version, not PACKAGE_VERSION, so the .o file does not change with each commit-derived version increment. * src/diff.c (main): Likewise. * src/diff3.c (main): Likewise. * src/sdiff.c (main): Likewise. * src/system.h: Include "version.h". * .gitignore: Add version.[ch]
* doc: ensure each program has a man/*.x file: add "SEE ALSO" referencesJim Meyering2011-06-125-5/+11
| | | | | | | | | * man/cmp.x: New file. * man/diff3.x: New file. * man/sdiff.x: New file. * man/diff.x: Add xrefs to the other three programs, and to patch. * man/Makefile.am (EXTRA_DIST): List new files. (cmp.1, diff3.1, sdiff.1): Depend on each .x file.
* doc: rename diff.texi to diffutils.texiJim Meyering2011-06-126-18/+15
| | | | | | | | | | | | | | | | This makes the .texi basename the same as the package name, which is consistent with most other GNU packages. * doc/diffutils.texi: Rename from... * doc/diff.texi: ...removed. * doc/Makefile.am (info_TEXINFOS): Reflect name change. (diffutils_TEXINFOS): Likewise. * cfg.mk (gendocs_options_): Remove this customization. It is no longer needed, now that the .texi name matches that of the package. * man/Makefile.am ($(dist_man1_MANS)): Remove now-unnecessary sed filter. * README: Update references to diffutils.texi etc. here, too. * .gitignore: Update here, too. Suggested by Karl Berry.
* cmp, diff, diff3, sdiff: edit and align --help text.Karl Berry2011-06-084-103/+146
| | | | | | | | * cmp.c (option_help_msgid, usage), * diff.c (option_help_msgid, usage), * diff3.c (option_help_msgid, usage), * sdiff.c (option_help_msgid, usage): align descriptions in the --help output and slightly edit content.
* diff: don't use locales after local-specific sorting failsPaul Eggert2011-05-271-3/+1
| | | | | | | * src/dir.c (compare_names): Don't invoke strcasecmp if locale-specific sorting fails, because POSIX.1-2008 says strcasecmp has unspecified behavior outside the POSIX locale. See: http://lists.gnu.org/archive/html/bug-diffutils/2011-05/msg00008.html
* bootstrap: Avoid multithreading.Paul Eggert2011-05-271-2/+4
| | | | | | | | | * bootstrap.conf (gnulib_tool_option_extras): Add "--avoid=localename --avoid=lock", because we don't want to bring in the multithreading code that recent gnulib changes would otherwise bring in. (excluded_files): Remove m4/lock.m4; no longer needed, now that we use --avoid=lock.
* build: update gnulib submodule to latestPaul Eggert2011-05-271-0/+0
|
* maint: update README-hackingKarl Berry2011-05-231-22/+66
| | | | * README-hacking: Update a la coreutils for git, etc.
* maint: update gnulib to latest with accompanying tight-scope tweaksJim Meyering2011-05-232-1/+4
| | | | | | | | * cfg.mk: Include $(srcdir)/dist-check.mk using "-include", to accommodate the new sc_tight_scope rule. (_gl_TS_extern): Define, to tell gnulib's tight_scope rule that headers here mark externs with "XTERN". * gnulib: Update to latest.
* maint: use gnulib's new readme-release moduleJim Meyering2011-05-183-83/+4
| | | | | | | * bootstrap.conf (gnulib_modules): Add readme-release. (bootstrap_epilogue): Add the recommended perl one-liner. * README-release: Remove file; it is now generated from gnulib. * .gitignore: Add it.
* build: update gnulib submodule to latestJim Meyering2011-05-181-0/+0
|
* maint: prepare for the tight-scope checkJim Meyering2011-05-182-39/+45
| | | | | | | | | | * src/diff.h: Mark function declarations with "extern" in preparation for the tight-scope check. (ignore_white_space): Separate enum decl from declaration of this variable. * src/Makefile.am (diff_SOURCES): Move diff.h from here to ... (noinst_HEADERS): ...here. For convenience, since the tight-scope rule uses $(noinst_HEADERS).
* maint: don't use now-removed gnulib "exit" moduleJim Meyering2011-05-181-1/+0
| | | | | * bootstrap.conf (gnulib_modules): Remove "exit" module. It no longer exists.
* build: update gnulib submodule to latestJim Meyering2011-03-261-0/+0
|
* * .x-sc_space_tab: Remove file. Instead, ...Jim Meyering2011-03-262-1/+2
| | | | * cfg.mk (exclude_file_name_regexp--sc_space_tab): ...define this.
* maint: fix typo in unused ruleJim Meyering2011-03-261-1/+1
| | | | * cfg.mk (config-save): Fix typo: add leading "_" in variable name.
* doc: add a reference to wdiff(1) from diff.1Jim Meyering2011-03-182-3/+8
| | | | | | | | * man/diff.x: New file, to add "SEE ALSO" reference to wdiff(1). * man/Makefile.am (diff.1): Depend on diff.x. ($(dist_man1_MANS)): Tell help2man to include diff.x. (EXTRA_DIST): Add diff.x. Suggestion from Dan Jacobson in http://bugs.debian.org/613319
* docs: info should mention -LEric Blake2011-03-181-1/+2
| | | | * doc/diff.texi (diff Options): Document -L.
* docs: diff --help should mention -LEric Blake2011-03-181-1/+1
| | | | * src/diff.c (option_help_msgid): Document -L.
* doc: speak of the --test (-a) option, not "the -a or --test option"Jim Meyering2011-02-151-83/+87
| | | | | | | | | | | | | | Convert using this command: perl -pi -e \ 's/(\@option{-.}) or (\@option{--.*?}) option/$2 ($1) option/' \ doc/diff.texi Then convert some more with this: perl -pi -e \ 's/the (\@option{-.}) or (\@option{--.*?})$/the $2 ($1)/' \ doc/diff.texi Then convert more manually. Suggested by Dan Jacobson
* maint: remove all uses of vfork: use fork insteadJim Meyering2011-01-245-53/+14
| | | | | | | | | | | | | Our use of vfork now provokes warnings from gcc-4.6.0. Also, vfork is no longer even specified by POSIX.1-2008. * src/diff3.c (read_diff): Change each use of vfork to "fork". Remove #ifdef'd code. * src/util.c (begin_output, finish_output): Likewise. * src/sdiff.c (cleanup, main, edit): Likewise. (handler_index_of_SIGPIPE): Remove now-unused definition. * src/system.h: Don't include <vfork.h>. (vfork): Remove definition. * ms/config.site: Remove reference to vfork cache variable.
* tests: avoid newer but less-portable tail option syntaxJim Meyering2011-01-241-1/+1
| | | | | | * tests/function-line-vs-leading-space: Use sed -n '3,$p' rather than tail -n+3. Older versions of tail do not accept that newer syntax. Reported by Sudhakara Peram.
* tests: fix an erroneous testJim Meyering2011-01-241-4/+4
| | | | | | | | | | | | On most systems, like-named files were compared, by luck. However, on others, different-named files would be compared since their names were being treated as equal -- but they had different content, so the test would fail. * tests/colliding-file-names: Use different sets of file names in d1 and d2 so that they cannot accidentally match. Put the same line in each test file. This is required when files named e.g., abc and ABC are compared. This test was failing on a NixOS 86_64-darwin system.
* build: update gnulib submodule to latestJim Meyering2011-01-241-0/+0
|
* tests: fix typo that silently disabled all testsJim Meyering2011-01-241-1/+3
| | | | * tests/Makefile.am (TESTS): Fix typo: s/jESTS/TESTS/
* build: update gnulib submodule to latestJim Meyering2011-01-231-0/+0
|
* maint: avoid new syntax-check failureJim Meyering2011-01-232-2/+2
| | | | | * src/diff.c (specify_value): Use !STREQ(...), not strcmp(...) != 0. * src/diff3.c (main): Likewise.
* maint: update copyright year ranges to include 2011Jim Meyering2011-01-0345-45/+45
| | | | Run "make update-copyright", so "make syntax-check" works in 2011.
* build: update gnulib submodule to latestJim Meyering2011-01-031-0/+0
|
* bootstrap: adjust to recent gnulib changesPaul Eggert2010-12-161-2/+0
| | | | | | * bootstrap.conf (excluded_files): Do not exclude m4/size_max.m4 and m4/xsize.m4 when using an external gettext, since they are now needed by other gnulib modules.
* doc: add contributor guidelines: HACKINGJim Meyering2010-12-161-0/+591
| | | | * HACKING: New file, copied 99% from the one in grep's repository.
* maint: describe policy on copyright year number rangesJim Meyering2010-10-091-12/+9
| | | | | * README: Mention coreutils' long-standing policy on use of M-N ranges in copyright year lists. Requested by Richard Stallman.
* maint: adjust init.sh use to conformJim Meyering2010-09-049-18/+9
| | | | | | | | | | | | | * tests/help-version: Use one line: "${srcdir=.}/init.sh"; ... * tests/basic: Likewise. * tests/binary: Likewise. * tests/colliding-file-names: Likewise. * tests/excess-slash: Likewise. * tests/function-line-vs-leading-space: Likewise. * tests/help-version: Likewise. * tests/label-vs-func: Likewise. * tests/no-newline-at-eof: Likewise. * tests/stdin: Likewise.
* maint: avoid shadowing warningJim Meyering2010-09-041-3/+3
| | | | * src/dir.c (diff_dirs): Rename shadowed local cmp to "c".
* build: use gettext-h, not gettextJim Meyering2010-09-041-1/+1
| | | | | | * bootstrap.conf (gnulib_modules): Use gettext-h, not gettext. The latter is overkill for a package that uses AM_GNU_GETTEXT([external]...
* build: update build/test tools from gnulibJim Meyering2010-09-042-47/+104
| | | | | * bootstrap: Update from gnulib. * tests/init.sh: Likewise.
* build: update gnulib submodule to latestJim Meyering2010-09-041-0/+0
|
* diff -r: avoid printing excess slashes in concatenated file namesJim Meyering2010-08-147-17/+26
| | | | | | | | | | | | * bootstrap.conf (gnulib_modules): Add filenamecat. * src/diff.c: Include "filenamecat.h". (compare_files): Use file_name_concat, rather than dir_file_pathname. * src/util.c (dir_file_pathname): Remove now-unused function. * src/diff.h: Remove its declaration. * tests/excess-slash: New script to test for this. * tests/Makefile.am (TESTS): Add it. Forwarded by Santiago Vila from <bugs.debian.org/586301a>, reported by Jari Aalto.
* diff: avoid spurious diffs when two distinct dir entries compare equalPaul Eggert2010-08-124-2/+65
| | | | | | | | | | | | Problem reported by Christoph Anton Mitterer in: http://lists.gnu.org/archive/html/bug-diffutils/2010-08/msg00000.html * NEWS: Mention this bug fix. * src/dir.c (compare_names_for_qsort): Fall back on file_name_cmp if two distinct entries in the same directory compare equal. (diff_dirs): Prefer a file_name_cmp match when available. * tests/Makefile.am (TESTS): New test colliding-file-names. * tests/colliding-file-names: New file.
* build: update gnulib submodule to latestJim Meyering2010-05-091-0/+0
|
* build: don't define macros that gnulib providesJim Meyering2010-05-093-28/+3
| | | | | | | | | * bootstrap.conf (gnulib_modules): Add signal, stdint. * lib/cmpbuf.c (SA_RESTART, SA_INTERRUPT): Remove definitions. (SIZE_MAX, PTRDIFF_MAX): Likewise. Include <stdint.h>. * src/system.h (WEXITSTATUS, WIFEXITED): Remove definitions. (SA_RESTART, SA_INTERRUPT): Likewise.
* build: rely on gnulib's sigprocmask moduleJim Meyering2010-05-092-23/+1
| | | | | * src/sdiff.c: Remove #if-!HAVE_SIGPROCMASK-guarded code. * bootstrap.conf (gnulib_modules): Add sigprocmask.
View Lorry Controller Status