summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* HACK to not build the docsbaserock/v3.3Javier Jardón2015-02-112-2/+1
| | | | | | | | There is a compilation problem with help2man: make[1]: Entering directory `/diff.build/man' GEN cmp.1 help2man: can't get '--help' info from cmp
* Update gitmodulesJavier Jardón2015-02-111-1/+1
|
* version 3.3v3.3Jim Meyering2013-03-241-1/+1
| | | | * NEWS: Record release date.
* doc: fix menu typoPaul Eggert2013-03-231-1/+1
| | | | | * doc/diffutils.texi (Comparing Three Files): Fix out-of-order menu. Bug caught by Texinfo 5.0.
* maint: update build procedure to recent gettext etc.Paul Eggert2013-03-233-46/+39
| | | | | | | | | | | | | | * bootstrap.conf (gnulib_modules): Add vararrays. (needed_gnulib_files, unnecessary_gettext_files): New vars. (bootstrap_post_import_hook): New function, to implement these vars. (excluded_files): Remove; 'bootstrap' no longer supports this. Its function is now performed by unnecessary_gettext_files. (buildreq): Update automake to 1.12.2, to avoid CVE-2012-3386. * configure.ac (AM_GNU_GETTEXT_VERSION): Bump from 0.17 to 0.18.2, to lessen the probability that we'll have outlandishly old files during a build. * m4/vararrays.m4: Remove from repository, as we now use the gnulib version.
* build: update gnulib to latest and adapt; update bootstrap, tooJim Meyering2013-03-214-44/+31
| | | | | | | | | | Blindly updating to the latest from gnulib, bootstrap would fail due to failure of our local patches to apply. Hence, these first two updates. * gl/lib/regex_internal.c.diff: Update offsets, so this patch applies to the latest from gnulib. * gl/lib/regex_internal.h.diff: Remove file. No longer needed. * bootstrap: Update from gnulib.
* tests: port to hosts lacking fmt, make -CPaul Eggert2013-01-061-2/+2
| | | | | * tests/Makefile.am (built_programs): Don't assume fmt works. Don't rely on 'make -C', either.
* maint: update .gitignore for recent gnulibPaul Eggert2013-01-061-0/+22
| | | | * .gitignore: Add tests/*.trs and several *.h and *.sed files in lib,
* build: update gnulib submodule to latestJim Meyering2013-01-041-0/+0
|
* maint: update all copyright year number rangesJim Meyering2013-01-0442-42/+41
| | | | Run "make update-copyright".
* build: default to --enable-gcc-warnings in a git treeEric Blake2012-10-231-1/+5
| | | | | | | | Anyone building from cloned sources can be assumed to have a new enough environment, such that enabling gcc warnings by default will be useful. Tarballs still default to no warnings, and the default can still be overridden with --disable-gcc-warnings. * configure.ac (gl_gcc_warnings): Set default based on environment.
* * doc/diffutils.texi (cmp Options): Document -l format better.Paul Eggert2012-10-031-0/+3
|
* maint: use xasprintf in place of xmalloc+sprintfJim Meyering2012-09-102-3/+3
| | | | | | * bootstrap.conf (gnulib_modules): Add gnulib's xvasprintf module. * src/util.c: Include "xvasprintf.h". (begin_output): Use xasprintf in place of xmalloc+sprintf.
* diff: encode file names with special charactersAndreas Gruenbacher2012-09-106-13/+172
| | | | | | | | | | | * src/util.c (c_escape_char): New function. (c_escape): New function. (begin_output): Escape file names when needed. * src/context.c (print_context_header): New names parameter. (print_context_label): New name parameter. * src/diff.h (print_context_header): Change prototype. * tests/filename-quoting: New file. * NEWS: Document this change.
* diff: silence GCC warning instead of slowing downPaul Eggert2012-08-301-1/+6
| | | | | | * src/dir.c (find_dir_file_pathname): Use 'IF_LINT (volatile)' to silence the gcc warning, rather than using 'volatile', as the warning appears to be bogus.
* diff: avoid possible longjmp-triggered misbehaviorJim Meyering2012-08-281-1/+1
| | | | | | * src/dir.c (find_dir_file_pathname): gcc 4.8.0 20120825 reported that a local variable's value might be clobbered. Declare "match" to be volatile.
* build: update gnulib, bootstrap and init.sh to latestJim Meyering2012-08-283-53/+83
|
* maint: avoid new syntax-check failure due to @xref useJim Meyering2012-08-281-6/+6
| | | | | * doc/diffutils.texi: Change several "; @xref{..." to ". @xref{...", since @xref should start a sentence.
* maint: remove ms subdirectoryPaul Eggert2012-05-158-506/+6
| | | | | | | | | | diffutils is now designed to build with Cygwin or MinGW. The old DJGPP stuff probably doesn't work anyway. * Makefile.am (SUBDIRS): Remove ms. * NEWS: Document this. * configure.ac (AC_CONFIG_FILES): Remove ms/Makefile. * ms/Makefile.am, ms/README, ms/config.bat, ms/config.sed: * ms/config.site: Remove.
* maint: update bootstrap from gnulibPaul Eggert2012-05-141-4/+2
| | | | * bootstrap: Update from gnulib.
* main: port subcommands to mingwPaul Eggert2012-05-144-67/+33
| | | | | | | | | | | | | | | | | | | Problem reported by Eli Zaretskii in <http://lists.gnu.org/archive/html/bug-gnu-utils/2012-05/msg00013.html>. Approach suggested by Bruno Haible as option (4) in <http://lists.gnu.org/archive/html/bug-gnu-utils/2012-05/msg00036.html>. * bootstrap.conf (gnulib_modules): Add system-quote. * src/diff3.c, src/sdiff.c, src/util.c: Include <system-quote.h>, not <sh-quote.h>. * src/diff3.c (read_diff): * src/sdiff.c (main, edit): * src/util.c (begin_output): Use system_quote_argv, for portability to Mingw. * src/sdiff.c (NUM_SIGS, handler_index_of_SIGINT): Now enum values, not macros; this is cleaner and avoids a GCC warning if !HAVE_WORKING_VFORK. * src/util.c (begin_output) [! HAVE_WORKING_FORK]: Do not use -f, for consistency with the HAVE_WORKING_FORK code.
* maint: update bootstrap from gnulibPaul Eggert2012-05-141-35/+64
| | | | * bootstrap: Update from gnulib.
* maint: m4/gnulib-cache.m4 is not under version controlPaul Eggert2012-05-141-0/+1
| | | | | This is like what coreutils does, and suppresses 'git status' chatter. * .gitignore: Add /m4/gnulib-cache.m4.
* Use binary mode when testing for binary files.Paul Eggert2012-05-143-9/+24
| | | | | | | | | | | | | This reverts the 2006-01-05 change and modernizes to the current API. Idea suggested by Eli Zaretskii in: http://lists.gnu.org/archive/html/bug-gnu-utils/2012-05/msg00066.html * src/cmp.c (main): * src/diff.c (main, compare_files): Use set_binary_mode rather than SET_BINARY. * src/diff.c (compare_files): Omit unnecessary use of O_BINARY. * src/io.c (sip): Sample unknown files in binary mode, to see whether they are binary. (read_files): Read binary files in binary mode.
* build: update gnulib submodule to latestPaul Eggert2012-05-144-35/+72
|
* build: omit obsolete AM_PROG_CC_STDC macroStefano Lattarini2012-05-131-1/+0
| | | | | | | The Automake-provided macro 'AM_PROG_CC_STDC' has been superseded by the Autoconf-provided one 'AC_PROG_CC' since October 2002, and will be removed in the next major automake version. * configure.ac (AM_PROG_CC_STDC): Drop it.
* diff: fix a typo that was always disabling the same_special_file macroJim Meyering2012-05-051-1/+1
| | | | | * src/system.h (same_special_file): Correct cpp guard expression: s/HAVE_ST_RDEV/HAVE_STRUCT_STAT_ST_RDEV/. Reported by Eli Zaretskii.
* maint: update bootstrap from gnulibJim Meyering2012-04-171-7/+19
| | | | * bootstrap: Update from gnulib.
* usage: improve wording of --ignore-matching-linesEric Blake2012-03-071-2/+2
| | | | * src/diff.c (option_help_msgid): Tweak wording.
* doc: explain -I RE better in --help outputPaul Eggert2012-03-042-2/+2
| | | | | | | * src/diff.c, src/sdiff.c (option_help_msgid): For -I RE, change "whose lines all match" to "all whose lines match" to avoid unintended interpretation. Reported by Danijel Tasov in <http://bugs.debian.org/648411>.
* sdiff: remove dependency on sigprocmaskPaul Eggert2012-02-122-10/+0
| | | | | | * bootstrap.conf (gnulib_modules): Remove sigprocmask. * src/sdiff.c (temporary_file): No need to invoke sigprocmask here, since the signal handler merely sets a flag.
* diff: -N, --unidirectional-new-file now compare to "-" tooPaul Eggert2012-02-045-25/+68
| | | | | | | | | | | * NEWS: Document this. * doc/diffutils.texi (Comparing Directories): Likewise. Also, document that these options work at the top level. * src/diff.c (compare_files): Treat EBADF like ENOENT, to handle the case where "-" is closed. Allow the other file to be STDIN_FILENO, in case it's "-". * tests/Makefile.am (TESTS): Add new-file. * tests/new-file: New file.
* maint: quote 'like this' or "like this", not `like this'Paul Eggert2012-01-2526-149/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | This is in response to a recent change in the GNU coding standards, which now suggest quoting 'like this' or "like this", instead of `like this' or ``like this''. * HACKING, NEWS, README, README-hacking, TODO, doc/diagmeet.note: * doc/diffutils.texi, ms/config.bat, ms/config.site: * src/analyze.c, src/cmp.c, src/context.c, src/diff.c: * src/diff.h, src/diff3.c, src/dir.c, src/ifdef.c, src/io.c: * src/sdiff.c, src/side.c, src/system.h, src/util.c: * tests/help-version: Quote 'like this' or "like this" in commentary. * cfg.mk (old_NEWS_hash): Adjust to reflect new NEWS quoting. * man/help2man: Update to 1.40.4 version, with quoting fixed as above. * po/en.po: Remove translation involving `, as it's no longer needed. * src/cmp.c (try_help, specify_ignore_initial, usage, main): * src/diff.c (main, try_help, option_help_msgid, specify_value) (compare_files): * src/diff3.c (main, try_help, option_help_msgid, usage) (read_diff): * src/dir.c (compare_names): * src/sdiff.c (try_help, usage, check_child_status, main): * src/util.c (finish_output): * tests/help-version: Quote 'like this' in output.
* build: update gnulib submodule to latestPaul Eggert2012-01-251-0/+0
|
* build: accommodate newer bootstrap from gnulibJim Meyering2012-01-124-176/+198
| | | | | | | | | * bootstrap.conf (gnulib_tool_option_extras): Add both --symlink and --makefile-name=gnulib.mk. Also remove now-obsolete $bt/ prefix. * bootstrap: Update from gnulib. * tests/init.sh: Update from gnulib. * lib/Makefile.am: Initialize numerous variables, so that generated code in gnulib.mk may use += to append to them.
* maint: avoid new syntax-check failureJim Meyering2012-01-121-1/+1
| | | | * src/diff.c (compare_files): Use STREQ, not strcmp.
* New option --no-dereference.Bruno Haible2012-01-086-4/+257
| | | | | | | | | | | | | | | * src/diff.h (no_dereference_symlinks): New variable. * src/diff.c: Include xreadlink.h. (longopts): Add --no-dereference option. (main): Accept --no-dereference option. (option_help_msgid): Mention the --no-dereference option. (compare_files): If no_dereference_symlinks is true, use lstat() instead of stat(). Compare symbolic links by comparing their values. * bootstrap.conf (gnulib_modules): Add lstat, stat, xreadlink. * doc/diffutils.texi (Comparing Directories, diff Options): Mention the --no-dereference option. * tests/no-dereference: New file. * tests/Makefile.am (TESTS): Add it.
* maint: update all copyright year number rangesJim Meyering2012-01-0146-47/+46
| | | | Run "make update-copyright".
* build: update to latest gnulib and adaptJim Meyering2011-12-1410-10/+11
| | | | | | | | | | | | | | | | | * tests/binary: Reverse arguments to compare to avoid failure of new syntax-check rule. * configure.ac: Use -Wno-format-nonliteral. Mark functions as pure of const, per recommendations enabled by new gcc -W options. Use _GL_ATTRIBUTE_PURE and _GL_ATTRIBUTE_CONST. * lib/cmpbuf.h (buffer_lcm, block_compare): Apply pure and/or const attributes. * src/cmp.c (block_compare): Likewise. * src/context.c (find_hunk): Likewise. * src/diff.h (lines_differ): Likewise. * src/diff3.c (skipwhite): Likewise. * src/dir.c (dir_loop): Likewise. * src/util.c (find_change, find_reverse_change): Likewise. (translate_line_number): Likewise.
* build: stop distributing gzip'd releases; xz is enoughJim Meyering2011-12-141-1/+1
| | | | * configure.ac (AM_INIT_AUTOMAKE): Add no-dist-gzip.
* tests: use "compare exp out", not "compare out exp"Jim Meyering2011-11-297-13/+13
| | | | | | | | | | | | | | | | | | | | | Likewise, when an empty file is expected, use "compare /dev/null out", not "compare out /dev/null". I.e., specify the expected/desired contents via the first file name. Prompted by a suggestion from Bruno Haible in http://thread.gmane.org/gmane.comp.gnu.grep.bugs/4020/focus=29154 Run these commands: git grep -l -E 'compare [^ ]+ exp' \ |xargs perl -pi -e 's/\b(compare) (\S+) (exp\S*)/$1 $3 $2/' git grep -l -E 'compare [^ ]+ /dev/null' \ |xargs perl -pi -e 's,\b(compare) (\S+) (/dev/null),$1 $3 $2,' But manually convert this one: -compare out exp-$(echo $opt|tr ' ' _) +compare exp-$(echo $opt|tr ' ' _) out and avoid an inappropriate change to cfg.mk.
* tests: use more portable fd redirection in TESTS_ENVIRONMENTStefano Lattarini2011-10-121-2/+1
| | | | | | | | * tests/Makefile.am (TESTS_ENVIRONMENT): Redirection with `exec 9>&2' is not portable to various Korn shells, and to (at least) HP-UX 11 /bin/sh. Use a more portable idiom. See http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/22488 for lots of discussion.
* tests: make test runner a script, not a shell functionStefano Lattarini2011-10-115-16/+3
| | | | | | | | | | | | | | | | | | | | | | | All the test scripts in the diffutils testsuite are shell scripts, so the current definition of TESTS_ENVIRONMENT, which adaptively run tests using either perl or the shell depending on their kind, is an overkill. Moreover, this change is required in order for the testsuite to continue to work with the new testsuite harness that is planned to be introduced in Automake 1.12 (which, as of the writing date, is still under development and in late alpha state). See also related discussion on bug-coreutils: <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8887> * tests/Makefile.am (TESTS_ENVIRONMENT): Remove definition of the `shell_or_perl_' shell function, which is not required anymore. (LOG_COMPILER): New, define to `$(SHELL)'. * tests/binary: Make executable. * tests/colliding-file-names: Likewise. * tests/excess-slash: Likewise. * tests/no-newline-at-eof: Likewise.
* portability: use SET_BINARY rather than xfreopen (NULL, ...Claudio Bley2011-10-043-5/+6
| | | | | | | * src/diff.c: Include binary-io.h, not xfreopen.h. (main): Use SET_BINARY (...) rather than xfreopen (NULL, X, ...), because the latter doesn't work on MinGW and crashes using MSVC. * src/cmp.c (main): Likewise.
* build: update gnulib submodule to latestJim Meyering2011-10-041-0/+0
|
* post-release administriviaJim Meyering2011-09-023-2/+5
| | | | | | * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update.
* version 3.2v3.2Jim Meyering2011-09-021-1/+1
| | | | * NEWS: Record release date.
* build: update bootstrap and tests/init.sh from gnulibJim Meyering2011-09-022-99/+212
| | | | | * bootstrap: Update from gnulib. * tests/init.sh: Likewise.
* build: update gnulib submodule to latestJim Meyering2011-09-021-0/+0
|
* doc: diffutils' texi-derived doc may now be in debian's "main" sectionJim Meyering2011-09-021-0/+6
| | | | * NEWS (Packaging): Mention the "no front/back-cover" change.
View Lorry Controller Status