summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Do not include regex.h, as diff.h does this now.Paul Eggert2004-04-121-32/+31
| | | | | | (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_line): Remove; replace with...Paul Eggert2004-04-121-13/+19
| | | | | | (next_line0, next_line1): New vars. (print_ifdef_script, print_ifdef_hunk): Use them to fix line-number computation bug.
* int -> long intPaul Eggert2004-04-121-3/+3
|
* Include <strcase.h>.Paul Eggert2004-04-121-26/+25
| | | | | | | | (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.
* (usage): Mention exit status.Paul Eggert2004-04-121-59/+92
| | | | | | | | | | | | (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.
* Include regex.h, unlocked-io.h.Paul Eggert2004-04-121-4/+6
| | | | | | (struct file_data.changed): Now char *, not bool *, to save space on hosts where bool takes more space than char. All uses changed.
* Do not include regex.h, as diff.h does this now.Paul Eggert2004-04-121-64/+78
| | | | | | | | | | | | | | | | | (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.
* Do not include regex.h, as diff.h does this now.Paul Eggert2004-04-122-12/+11
|
* Sort includes. Include <exit.h>, <unlocked-io.h>.Paul Eggert2004-04-121-30/+37
| | | | | | | | (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.
* (diag): Return void, not lin, since the returnPaul Eggert2004-03-121-60/+35
| | | | | | | | | | | 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.
* (diff3.$(OBJEXT), diff.$(OBJEXT), sdiff.$(OBJEXT)):Paul Eggert2002-10-151-1/+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.
* (MOSTLYCLEANFILES): Add paths.ht.Paul Eggert2002-10-141-2/+3
| | | | | | | (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>.
* (briefly_report): Don't say "Binary files differ", since onePaul Eggert2002-06-281-8/+3
| | | | | of the files may not be a binary file. Bug reported by Dan Jacobson.
* Include version-etc.h, not freesoft.h.Paul Eggert2002-06-173-32/+11
| | | | | | (copyright_notice): Remove. (main): Use version_etc to print version. (version_string): Remove decl.
* (version_string): Remove decl.Paul Eggert2002-06-171-3/+0
|
* Include version-etc.h, not freesoft.h.Paul Eggert2002-06-171-8/+2
| | | | | (copyright_notice): Remove. (main): Use version_etc to print version.
* (cmp_SOURCES, diff3_SOURCES, sdiff_SOURCES, diff_SOURCES):Paul Eggert2002-06-171-10/+4
| | | | | Remove version.c. (MAINTAINERCLEANFILES, $(srcdir)/version.c): Remove.
* (readnum): Fix autoincrement typo.Paul Eggert2002-06-111-2/+2
|
* Trim trailing white space.Paul Eggert2002-06-111-3/+3
|
* (finish_output): Check for ENOEXEC.Paul Eggert2002-06-111-15/+37
| | | | | | (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.
* *** empty log message ***Paul Eggert2002-06-111-26/+0
|
* (tab_from_to, print_half_line, print_1sdiff_line):Paul Eggert2002-06-111-23/+21
| | | | New option --tabsize=COLUMNS.
* Include <file-type.h>.Paul Eggert2002-06-111-39/+37
| | | | | | | | | | | | | 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.
* Include <file-type.h>.Paul Eggert2002-06-111-6/+11
| | | | (find_and_hash_each_line): New option --tabsize=COLUMNS.
* Include <file-type.h>.Paul Eggert2002-06-111-295/+269
| | | | | | | | | | | 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.
* (TAB_WIDTH): Remove.Paul Eggert2002-06-111-4/+5
| | | | | | (tabsize): New decl. (sdiff_half_width, sdiff_column2_offset): Now size_t rather than unsigned int.
* Include <file-type.h>.Paul Eggert2002-06-111-64/+46
| | | | | | | | | | | | | 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 <file-type.h>.Paul Eggert2002-06-111-8/+9
| | | | | | | Include paths.h. (copyright_notice): Renamed from copyright_string. Now a msgid, so that copyright symbol can be translated. All uses changed.
* Include <file-type.h>.Paul Eggert2002-06-111-0/+1
|
* (noinst_HEADERS): Remove diff.h.Paul Eggert2002-06-111-3/+8
| | | | | | | | | (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.
* (SSIZE_MAX): Define if limits.h doesn't.Paul Eggert2002-04-051-0/+3
|
* Include cmpbuf.h.Paul Eggert2002-04-051-18/+12
| | | | (read_diff): Use block_read instead of read, to work around Tru64 5.1 bug.
* (cmp): Use block_read instead of read, to work around Tru64 5.1 bug.Paul Eggert2002-04-051-12/+6
|
* Assign PTRDIFF_MAX - 1 to a size_t variable, just in case there's a problemPaul Eggert2002-04-051-2/+3
| | | | with ptrdiff_t versus size_t.
* (datadir, INCLUDES): Remove.Paul Eggert2002-04-051-2/+1
| | | | (AM_CPPFLAGS): New macro.
* (sip): Do not mishandle buffered count when reverting to text mode.Paul Eggert2002-03-251-2/+3
|
* (main): Fix typo that prevented diff -y from working. Bug reported byPaul Eggert2002-03-241-4/+5
| | | | Mitsuru Chinen.
* (cmp): Fix typos in previous change.Paul Eggert2002-03-121-5/+5
|
* Use "byte" rather than "char" if a translation for "byte" is available.Paul Eggert2002-03-121-6/+20
|
* (option_help_msgid): Bring back --horizon-lines documentation.Paul Eggert2002-03-121-0/+1
|
* -L -> --labelPaul Eggert2002-03-121-1/+1
|
* (option_help_msgid): Do not document -L, -P, --horizon-lines,Paul Eggert2002-03-121-7/+7
| | | | --inhibit-hunk-merge, -H.
* (specify_comparison_type): New function.Paul Eggert2002-03-121-15/+21
| | | | | (check_stdout): "indices and codes" -> "byte numbers and values" (main): Use specify_comparison_type to detect option clashes.
* (option_help_msgid, usage): Reword for help2man.Paul Eggert2002-03-112-10/+10
|
* Remove trailing white space.Paul Eggert2002-03-111-1/+1
|
* (option_help_msgid): Reword for help2man.Paul Eggert2002-03-111-4/+6
|
* (usage): Reword for help2man.Paul Eggert2002-03-111-4/+5
|
* (AUTOMAKE_OPTIONS): Remove.Paul Eggert2002-03-111-2/+0
|
* Include <xalloc.h>.Paul Eggert2002-02-281-0/+2
|
* (LONG_OPTION, GROUP_FORMAT_OPTION, LINE_FORMAT_OPTION): Remove.Paul Eggert2002-02-281-13/+4
| | | | (longopts): Revert to prevision version.