| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
| |
(find_and_hash_each_line): Don't convert char *
to unsigned char *; just leave pointers as char *. This
lessens the number of potentially-dangerous casts.
|
|
|
|
|
|
| |
(next_line0, next_line1): New vars.
(print_ifdef_script, print_ifdef_hunk):
Use them to fix line-number computation bug.
|
| |
|
|
|
|
|
|
|
|
| |
(failed_locale_specific_sorting): Renamed from failed_strcoll.
All uses changed.
(compare_names): Don't invoke strcasecmp first thing when
ignore_file_name_case; if locale_specific_sorting, we should
just use that.
|
|
|
|
|
|
|
|
|
|
|
|
| |
(main): Adjust to latest gnulib c_stack_action calling conventions.
Adjust to latest version_etc calling conventions.
Include unlocked-io.h.
(strip_trailing_cr): New var.
(STRIP_TRAILING_CR_OPTION): New enum.
(longopts, main, option_help_msgid, read_diff):
Add --strip-trailing-cr support.
(read_diff): Exit with status 126 (not 127) if errno != ENOENT
after failed execvp in child. Report this in parent.
|
|
|
|
|
|
| |
(struct file_data.changed): Now char *, not bool *, to save
space on hosts where bool takes more space than char.
All uses changed.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(option_help_msgid): Mention exit status.
(main): Adjust to latest gnulib c_stack_action calling conventions.
Adjust to latest version_etc calling conventions.
Include <exit.h>.
(binary): Define to true if not declared.
(longopts): Set tabsize flag to 1.
(main): Don't output nanoseconds if platform lacks them.
Don't treat files as binary if !binary.
(set_mtime_to_now): Use 0, not NULL.
(compare_files): Mark files as nonexistent if it looks like
'patch' created inaccessible regular empty files to denote
nonexistent backups. Don't compare such files.
Clear st_* members of status of nonexistent file.
Remove now-unnecessary tests.
|
| |
|
|
|
|
|
|
|
|
| |
(specify_comparison_type): Don't report an error if the comparison
type has already been specified the same way as this one.
(usage): Mention exit status.
(main): Adjust to latest gnulib c_stack_action calling conventions.
(main): Adjust to latest version_etc calling conventions.
|
|
|
|
|
|
|
|
|
|
|
| |
value wasn't needed. All callers changed.
(diag, diff_2_files):
Use 'true' and 'false' instead of '1' and '0', when appropriate.
(compareseq): Use lin const * local variables instead of lin *.
Don't bother checking diag's return value.
(shift_boundaries, build_reverse_script, build_script, diff_2_files):
Use char arrays, not bool arrays, since
sizeof (bool) might be greater than 1.
|
|
|
|
|
|
|
| |
Rename from (misspelled) diff3.$(OBJECT), diff.$(OBJECT), sdiff.$(OBJECT).
Patch by Paul D. Smith in
<http://mail.gnu.org/pipermail/bug-gnu-utils/2002-October/003251.html>.
Bug reported by Chris Bainbridge.
|
|
|
|
|
|
|
| |
(paths.h): Send output to paths.ht first, and then rename to
paths.h at the end. This avoids problems if the disk is full.
It also works around what appears to be a bug with GNU make -j
(3.79.1); see <http://bugs.gentoo.org/show_bug.cgi?id=8934>.
|
|
|
|
|
| |
of the files may not be a binary file.
Bug reported by Dan Jacobson.
|
|
|
|
|
|
| |
(copyright_notice): Remove.
(main): Use version_etc to print version.
(version_string): Remove decl.
|
| |
|
|
|
|
|
| |
(copyright_notice): Remove.
(main): Use version_etc to print version.
|
|
|
|
|
| |
Remove version.c.
(MAINTAINERCLEANFILES, $(srcdir)/version.c): Remove.
|
| |
|
| |
|
|
|
|
|
|
| |
(lines_differ, output_1_line): New option --tabsize=COLUMNS.
(analyze_hunk): If -b or -w is also specified, -B now considers
lines to be empty if they contain only white space.
|
| |
|
|
|
|
| |
New option --tabsize=COLUMNS.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Include paths.h.
(copyright_notice): Renamed from copyright_string.
Now a msgid, so that copyright symbol can be translated.
All uses changed.
(catchsig, signal_handler, initial_action): Signal handlers return void,
not RETSIGTYPE, since we no longer support K&R.
(TABSIZE_OPTION): New constant.
(longopts, usage, main): New option --tabsize=COLUMNS.
(cleanup): New arg signo. All uses changed.
(ck_editor_status, main, edit): Don't worry about ENOEXEC.
|
|
|
|
| |
(find_and_hash_each_line): New option --tabsize=COLUMNS.
|
|
|
|
|
|
|
|
|
|
|
| |
Include paths.h.
(copyright_notice): Renamed from copyright_string.
Now a msgid, so that copyright symbol can be translated.
All uses changed.
(skipwhite, readnum): New functions.
(process_diff_control): Use them.
(SKIPWHITE, READNUM): Remove.
(read_diff): Don't worry about errno == ENOEXEC.
|
|
|
|
|
|
| |
(tabsize): New decl.
(sdiff_half_width, sdiff_column2_offset): Now size_t rather than
unsigned int.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Include paths.h.
(copyright_notice): Renamed from copyright_string.
Now a msgid, so that copyright symbol can be translated.
All uses changed.
Include posixver.h.
(TABSIZE_OPTION): New constant.
(main): Allow widths up to SIZE_MAX.
(filetype): Move to lib/file-type.c and rename to file_type.
All uses changed.
(longopts, main, usage): New option --tabsize=COLUMNS.
|
|
|
|
|
|
|
| |
Include paths.h.
(copyright_notice): Renamed from copyright_string.
Now a msgid, so that copyright symbol can be translated.
All uses changed.
|
| |
|
|
|
|
|
|
|
|
|
| |
(DEFS): Remove.
(diff_sources): Add diff.h.
(MOSTLYCLEANFILES): New macro.
(cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT)): Depend
on paths.h.
(paths.h): New rule.
|
| |
|
|
|
|
| |
(read_diff): Use block_read instead of read, to work around Tru64 5.1 bug.
|
| |
|
|
|
|
| |
with ptrdiff_t versus size_t.
|
|
|
|
| |
(AM_CPPFLAGS): New macro.
|
| |
|
|
|
|
| |
Mitsuru Chinen.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
--inhibit-hunk-merge, -H.
|
|
|
|
|
| |
(check_stdout): "indices and codes" -> "byte numbers and values"
(main): Use specify_comparison_type to detect option clashes.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
(longopts): Revert to prevision version.
|