summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Assume C89 or better.Paul Eggert2001-11-241-248/+242
| | | | | | | | int -> lin for line numbers. (format_group): Use strtoumax to parse line numbers. (format_group, print_ifdef_lines): Use do_printf_spec to handle printf specs. (groups_letter_value): Don't use _tolower; it's locale-dependent. (do_printf_spec): Renamed from scan_printf_spec; now does the printing.
* Assume C89 or better.Paul Eggert2001-11-241-69/+40
| | | | | int -> lin for line numbers (or 'long' when that's more convenient). (print_ed_hunk): Fix bug when handling double-dot inserts.
* Assume C89 or better.Paul Eggert2001-11-241-37/+66
| | | | | | | | | | | | | | | int -> bool for booleans. Include error.h, exclude.h, xalloc.h. (dir_sort): Return 0 on error, 1 on success. All callers changed. compare_names -> compare_names_for_qsort. (compare_names): Try strcasecmp if ignore_file_name_case. Then try strcoll. Use file_name_cmp only as a last resort. Warn about strcasecmp or strcoll failure. (compare_names_for_qsort): New function. (diff_dirs): Use compare_names rather than filename_cmp.
* Assume C89 or better.Paul Eggert2001-11-241-308/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | int -> bool for booleans. int -> lin for line numbers. Use angle-brackets when including getopt.h, quotesys.h. Include error.h, freesoft.h, inttostr.h, xalloc.h. (copyright_string): Use only most recent year. (authorship_msgid, option_help_msgid): Wrap in N_(). Rename the following variables for consistency with user-visible option spellings. All uses changed. (text): Renamed from always_text. (initial_tab): Renamed from tab_align_flag. (horizon_lines): Remove. Remove all uses. (main): Invoke bindtextdomain and textdomain after setlocale. Rename "DIFF" to "DIFF_PROGRAM". Try to compare file0 to file1, because this is where changes are expected to come from. Diffing between these pairs of files is more likely to avoid phantom changes from file0 to file1. However, use file2 as the common file if this is a 3-way diff, for backward compatibility. (create_diff3_block): Use xcalloc instead of malloc + bzero. (INT_STRLEN_BOUND): Remove; now in system.h. (read_diff): Always use --horizon-lines=100 rather than trying to guess it. Do not pass --inhibit-hunk-merge. Minimum chunk size is 1, not 8KiB. Use xalloc_die to report memory exhaustion. (undotlines): Use long for start, not int.
* Assume C89 or better.Paul Eggert2001-11-241-119/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | int -> bool for booleans. int -> lin for line numbers. Don't include regex.h. (enum changes): New enum. (enum line_class): Remove; subsumed by enum changes. (enum output_style): New constant OUTPUT_UNSPECIFIED. (ignore_space_change_flag, ignore_all_space_flag): Remove. (ignore_white_space): New decl, subsuming the above two. All uses changed. Rename the following decls for consistency with user-visible option spellings. All uses changed. (text): Renamed from always_text_flag. (ignore_blank_lines): Renamed from ignore_blank_lines_flag. (ignore_case): Renamed from ignore_case_flag. (brief): Renamed from no_details_flag. (initial_tab): Renamed from tab_align_flag. (expand_tabs): Renamed from tab_expand_flag. (starting_file): Renamed from dir_start_file. (paginate): Renamed from paginate_flag. (sdiff_merge_assist): Renamed from sdiff_help_sdiff. (left_column): Renamed from sdiff_left_only. (suppress_common_lines): Renamed from sdiff_skip_common_lines. (speed_large_files): Renamed from heuristic. (minimal): Renamed from no_discards. (inhibit_hunk_merge): Remove. (strip_trailing_cr, excluded, time_format): New decls. (files_can_be_treated_as_binary): Renamed from ignore_some_changes. (group_format, line_format): Now char const *[], not char *[]. (struct file_data): Buffer is now word*, not char*, as it's always aligned and this can help the compiler. buffered_chars -> buffered (since it's a byte count, not a char count). All uses changed. New member `eof'. (FILE_BUFFER): New macro. (excluded_filename, error, free_software_msgid): Remove decls; now in other .h files. (sip, slurp): Remove decls. (file_block_read): New decl. (change_letter): Now an array, not a function. (lines_differ): Renamed from line_cmp. (analyze_hunk): Now returns enum changes rather than two change counts.
* (diff_LDADD): New symbol.Paul Eggert2001-11-241-0/+1
|
* Assume C89 or better.Paul Eggert2001-11-241-418/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | int -> bool for booleans. long -> off_t for line numbers. Use angle-brackets when including getopt.h, fnmatch.h, quotesys.h. Include error.h, exclude.h, freesoft.h, hard-locale.h, prepargs.h, regex.h, signal.h, xalloc.h. (copyright_string): Use only most recent year. (authorship_msgid, option_help_msgid): Wrap in N_(). Rename the following variables for consistency with user-visible option spellings. All uses changed. (binary): Renamed from binary_flag. (new_file): Renamed from entire_new_file_flag. (unidirectional_new_file): Renamed from unidirectional_new_file_flag. (report_identical_files): Renamed from print_file_same_flag. (numeric_arg): Remove. (exclude, exclude_alloc, exclude_count, excluded_filename, add_exclude, add_exclude_file): Remove; now done by exclude.h. (BINARY_OPTION, FROM_FILE_OPTION, HELP_OPTION, HORIZON_LINES_OPTION, IGNORE_FILE_NAME_CASE_OPTION, INHIBIT_HUNK_MERGE_OPTION, LEFT_COLUMN_OPTION, LINE_FORMAT_OPTION, NORMAL_OPTION, SDIFF_MERGE_ASSIST_OPTION, STRIP_TRAILING_CR_OPTION, SUPPRESS_COMMON_LINES_OPTION, TO_FILE_OPTION, UNCHANGED_LINE_FORMAT_OPTION, OLD_LINE_FORMAT_OPTION, NEW_LINE_FORMAT_OPTION, UNCHANGED_GROUP_FORMAT_OPTION, OLD_GROUP_FORMAT_OPTION, NEW_GROUP_FORMAT_OPTION, CHANGED_GROUP_FORMAT_OPTION): New constants. (longopts, main): Use them. (longopts, main, option_help_msgid): Add -E, --from-file, --to-file. (main): Invoke bindtextdomain and textdomain after setlocale. Use grep syntax, not Emacs, for regular expressions. Use exclude.h, not our own functions. Use ISO 8601 time format in hard locales. Prepend DIFF_OPTIONS. Don't update ignore_some_changes. Use strtoumax instead of numeric_arg. Use specify_value when appropriate. error -> try_help when appropriate. -p now means ^[[:alpha:]$_], not ^[_a-zA-Z$]. Ignore --inhibit-hunk-merge. Prefer changed group formats to unchanged ones. Remove now-unnecessary casts. Set files_can_be_treated_as_binary. (specify_value): Renamed from specify_format. All uses changed. (specify_style): Default is now unspecified, not normal. All uses changed. (set_mtime_to_now): New function. (compare_files): Use it. Use memset, not bzero. Set stdin mtime to current time even when stdin is not a regular file. Check for same file attributes, as well as for same file. Use files_can_be_treated_as_binary. "write failed" -> "standard output on output failure.
* Assume C89 or better.Paul Eggert2001-11-241-110/+106
| | | | | | | | | | | | int -> lin for line numbers. Include inttostr.h, regex.h. (TIMESPEC_NS): New macro. (nstrftime): New decl. (print_context_label): Use nstrftime and time_format to format times. Print numeric time stamp value if localtime fails. (print_context_function): New function. (pr_context_hunk, pr_unidiff_hunk): Use it. (find_function): Use size_t for sizes, not int.
* Assume C89 or better.Paul Eggert2001-11-241-176/+150
| | | | | | | | | | | | | | | | | | | | | | | | int -> bool for booleans. long -> off_t for line numbers. Use angle-brackets when including cmpbuf.h, getopt.h. Include error.h, freesoft.h, inttostr.h, xalloc.h. (copyright_string): Use only most recent year. (authorship_msgid): Wrap in N_(). (buffer): Now word*, not char*. All uses changed. (word): Remove macro; now in system.h. (long_options, option_help_msgid, main): -c --print-chars -> -b --print-bytes (check_stdout): "write failed" -> "standard output" (option_help_msgid): Wrap in N_(). (main): Invoke bindtextdomain and textdomain after setlocale. Use strtoumax instead of doing the work ourselves. Check for same_file_attributes as well as same_file. (cmp): Use ssize_t for read returns, not size_t. Do not assume that size_t is not narrower than int. Do not assume that line numbers fit in 'long'. (block_compare_and_count, block_compare): Compiler now checks that buffers are word-aligned. (block_compare_and_count): Count sizes with size_t, not long. (sprintc): byte arg is unsigned char, not unsigned.
* Assume C89 or better.Paul Eggert2001-11-241-222/+191
| | | | | | | | | | | | | | | | | int -> lin for line numbers. int -> bool for booleans. unsigned int -> size_t for sizes. Use angle-brackets when including cmpbuf.h. Include error.h, regex.h, xalloc.h. (discard_confusing_lines, diff_2_files): Use zalloc rather than xalloc+bzero. (discard_confusing_lines): unsigned int -> lin for values that are really line numbers. (shift_boundaries): Do not inhibit hunk merges. (build_reverse_script, build_script, diff_2_files): Use |, not ||, for speed. (diff_2_files): no_details_flag & ~ignore_some_changes -> files_can_be_treated_as_binary. Esure that buffer size is a multiple of sizeof (word). Use file_block_read to read buffers. (diff_2_files): Abort if output style is not one of the expected styles.
* Initial revisionPaul Eggert2001-11-231-0/+49
|
* Initial revisionPaul Eggert2001-11-2311-0/+303
|
* (jm_PREREQ_READUTMP): Remove, as it gives autoheader the willies.Paul Eggert2001-11-231-28/+0
|
* Include config.h, freesoft.h rather than diff.h.Paul Eggert2001-11-231-4/+26
| | | | (free_software_msgid): Wrap contents in N_.
* Use prototypes instead of old-style functions.Paul Eggert2001-11-231-21/+3
|
* Don't include system.h; instead, include config.h, unistd.h.Paul Eggert2001-11-231-15/+21
| | | | | Use prototypes instead of old-style functions. (block_read): Don't assume that int is no wider than size_t.
* Initial revisionPaul Eggert2001-11-233-0/+81
|
* Define filename_cmp as an object-like macro, not as a function-likePaul Eggert2001-11-231-1/+1
| | | | macro.
* Always operate in the C locale.Paul Eggert2001-11-231-8/+13
| | | | Set AWK using a method that works even with broken shells.
* (AC_INIT): Use src/diff.c, not diff.h, as the source files got removed.Paul Eggert2001-11-231-83/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (AM_CONFIG_HEADER): Switch from AC_CONFIG_HEADER. (AC_ARG_PROGRAM, AC_MINIX): Remove. (AC_PREREQ, AM_INIT_AUTOMAKE, ALL_LINGUAS, AC_PROG_AWK, AM_PROG_CC_STDC, AC_PROG_RANLIB, AC_C_INLINE, AC_C_VARARRAYS, DEFAULT_DIFF_PROGRAM, DEFAULT_EDITOR_PROGRAM, AC_STRUCT_ST_MTIM_NSEC): Add. (PR_PROGRAM): AC_DEFINE. (AC_SYS_LARGEFILE): Use instead of our homebrew version. (_GNU_SOURCE): Define if not defined. (AC_CHECK_HEADERS): Add stdbool.h, unistd.h. (AC_CHECK_TYPES): Add ptrdiff_t, uintmax_t. (AM_GNU_GETTEXT, XGETTEXT): Add. (WITH_MVFS_STAT_BUG, WITH_NFS_STAT_BUG): Remove. (HAVE_MEMCHR): Remove. (AC_CHECK_FUNCS): Add diraccess. (AC_REPLACE_FUNCS): Add memchr, waitpid. (jm_FUNC_GLIBC_UNLOCKED_IO, jm_FUNC_GNU_STRFTIME, jm_FUNC_MALLOC, jm_FUNC_REALLOC, jm_PREREQ_ERROR, jm_PREREQ_QUOTEARG, jm_PREREQ_REGEX, jm_PREREQ_TEMPNAME, jm_AC_PREREQ_XSTRTOUMAX, AC_FUNC_FNMATCH): Add. (fnmatch.h, regex.h): Do not create these files unless we're using our own fnmatch and regex. (AC_OUTPUT): Add doc/Makefile, intl/Makefile, lib/Makefile, lib/posix/Makefile, m4/Makefile, po/Makefile.in, src/Makefile.
* Don't translate "program" to "programme".Paul Eggert2001-11-231-4/+1
|
* Initial revisionPaul Eggert2001-11-201-0/+165
|
* Initial revisionPaul Eggert2001-11-201-0/+14
|
* Initial revisionPaul Eggert2001-11-041-0/+1067
|
* Initial revisionPaul Eggert2001-10-271-0/+1188
|
* Initial revisionPaul Eggert2001-10-221-0/+87
|
* Initial revisionPaul Eggert2001-09-291-0/+288
|
* Initial revisionPaul Eggert2001-08-232-0/+366
|
* Initial revisionPaul Eggert2001-08-121-0/+25
|
* Initial revisionPaul Eggert2001-07-151-0/+17
|
* Initial revisionPaul Eggert2001-07-071-0/+83
|
* Initial revisionPaul Eggert2001-07-061-0/+372
|
* Initial revisionPaul Eggert2001-04-021-0/+566
|
* Initial revisionPaul Eggert2001-01-261-0/+116
|
* Initial revisionPaul Eggert2000-10-311-0/+87
|
* Initial revisionPaul Eggert2000-08-071-0/+38
|
* From GCC repositoryPaul Eggert2000-02-061-0/+118
|
* (lf_snarf): Fix bug when help line wrapped around the input buffer.Paul Eggert1998-12-121-3/+1
|
* Add dircategory.Paul Eggert1998-09-151-0/+5
|
* Include <config.h> before using "const".Paul Eggert1998-09-144-5/+9
|
* ($D.tar.gz): Don't use ln to create distribution; it doesn'tPaul Eggert1998-09-141-1/+1
| | | | work with symlinks.
* (AC_PATH_PROG): Add PR_PROGRAM.Paul Eggert1998-09-141-2/+76
| | | | | | | | | | If available, prefer support for large files unless the user specified one of the CPPFLAGS, LDFLAGS, or LIBS variables. (AC_STRUCT_ST_RDEV): Add. (HAVE_ST_FSTYPE_STRING): Add. (--with-mvfs-stat-bug, --with-nfs-stat-bug): New options. (HAVE_MEMCHR): New macro. (AC_CHECK_FUNCS): Add sicprocmask.
* Add --with-mvfs-stat-bug, --with-nfs-stat-bug.Paul Eggert1998-09-141-1/+1
|
* (quotesys.h): Include.Paul Eggert1998-09-141-2/+2
| | | | | | | | | | (PR_PROGRAM): New macro. (pfatal_with_name): Abort if error returns. (fatal): Likewise. (print_message_queue): Free message chain after printing. (currently_recursive): Renamed from current_depth, and now a boolean. (begin_output): Report error if fflush does. Avoid stdio and gettext in child.
* (__attribute__): New macro.Paul Eggert1998-09-141-1/+1
| | | | | | | | | | (getenv): Don't declare if HAVE_STDLIB_H. (CHAR_MAX): New macro. (<locale.h>): New include. (<locale.h>): Include before <libintl.h>. (could_be_mvfs_stat_bug, could_be_nfs_stat_bug, dev_may_have_duplicate_ino, same_special_file): New macros. (same_file): Use them.
* (print_half_line): Add brackets to pacify GCC -Wall.Paul Eggert1998-09-141-1/+1
|
* (quotesys.h): Include.Paul Eggert1998-09-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | (DIFF_PROGRAM, DEFAULT_EDITOR_PROGRAM): Remove. (free_software_msgid, editor_program, not_found): New vars. (diffbin, edbin): Remove. (editor_program): Renamed from edbin. (edit, interact): Now take extra string arg. (exiterr, fatal, perror_fatal, try_help): Add noreturn attribute. (sigset_t, sigemptyset, sigmask, sigaddset, SIG_BLOCK, SIG_SETMASK): (sigprocmask): New macros, if !HAVE_SIGPROCMASK. (error): Now has printf attribute. (longopts, main): Don't assume ASCII. (try_help): New operand arg. (usage): Conform to new GNU standards. (main): Set static vars for editor and diff program. Compare getopt_long result to -1, not EOF. -v conforms to new GNU standard. Complain better about extra and missing operands. If HAVE_VFORK, block SIGINT and SIGPIPE in the parent, since when the child munges its handlers it may somp on the parent. Pass rname to intract. Translate not-found message before forking. (give_help): Just output it all at once. (edit): New args lname, lline, rname, rline. (edit): New command 'd'. (interact): New args lname, rname.
* Update FSF address.Paul Eggert1998-09-141-1/+1
|
* (cmpbuf.h): Include.Paul Eggert1998-09-141-1/+1
| | | | (slurp): Check for arithmetic overflow when computing buffer size.
* Remove `#if 0'ed code.Paul Eggert1998-09-141-1/+1
|
View Lorry Controller Status