summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* 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.
* * bootstrap: Import from gnulib.Paul Eggert2009-11-112-41/+65
|
* * 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.
View Lorry Controller Status