471 Commits

Author SHA1 Message Date
Paul Eggert
4b67faa4ad Mention INSTALLME. 2002-01-24 20:16:38 +00:00
Paul Eggert
ffaecd082c (AC_INIT, AM_INIT_AUTOMAKE): Version 2.7.7.
Reformat for imminent 2.8 release.
2002-01-24 20:16:38 +00:00
Paul Eggert
6f653ba471 (EXTRA_DIST): Add config/config.rpath, INSTALLME.
(DISTCLEANFILES): Remove.
2002-01-24 20:16:38 +00:00
Paul Eggert
788366578a (finish_output): Ensure that werrno is initialized.
(lines_differ): Have an explicit do-nothing case for
IGNORE_NO_WHITE_SPACE, to pacify gcc -Wall.
2002-01-24 20:16:38 +00:00
Paul Eggert
17832e035d (UINTMAX_MAX): New macro.
Include gettext.h, not libgettext.h.
(N_): Do not wrap arg in parentheses.  Fix from Bruno Haible.
2002-01-24 20:16:38 +00:00
Paul Eggert
f8b1a9f4e4 (copyright_string): Update to 2002.
(usage): Reformat messages to ease translation.
(handler_index_of_SIGINT, handler_index_of_SIGPIPE):
New macros.
(main): Do not confuse signal numbers with their indices.
Bug reported by Bruno Haible.
(edit): Cat lin to long before printing with %ld, since lin might
be narrow than long.
2002-01-24 20:16:38 +00:00
Paul Eggert
ec7bf151d0 (file_block_read): Use SIZE_MAX instead of (size_t) -1,
to avoid warnings on some compilers.
2002-01-24 20:16:38 +00:00
Paul Eggert
8d25777b1a Include <setjmp.h>
(struct dirdata): New member nnames.
(locale_specific_sorting, failed_strcoll): New vars.
(dir_read): Renamed from dir_sort.  Don't sort the dir.
Set new nnames member of struct dirdata.  All callers changed.
(compare_names): Don't check for errno after strcasecmp.
Use strcoll only if locale_specific_sorting is nonzero.
If strcoll fails, longjmp out rather than returning a value
that might result in an invalid comparison function that might
make qsort dump core.
(diff_dirs): Sort the directory ourselves.  Use setjmp to recover
from strcoll failure, falling back on native byte comparison.
Make local variables volatile if they need to preserve their value
after setjmp/longjmp.
2002-01-24 20:16:38 +00:00
Paul Eggert
a76d0e1130 (copyright_string): Update to 2002.
(usage): Reformat messages to ease translation.
(main): Remove unused variable.
2002-01-24 20:16:38 +00:00
Paul Eggert
89d3f55dd6 (copyright_string): Update to 2002.
(bytes, parse_ignore_initial, cmp): Use UINTMAX_MAX
instead of (uintmax_t) -1, to avoid warnings on some compilers.
(usage): Reformat messages to ease translation.
2002-01-24 20:16:38 +00:00
Paul Eggert
5289afd403 Include <string.h>. Reported by Bruno Haible. 2002-01-24 20:16:38 +00:00
Paul Eggert
eadc9ce7d6 Fix comment. 2002-01-24 20:16:38 +00:00
Paul Eggert
75cd3e885f (noinst_HEADERS): Add gettext.h. 2002-01-24 20:16:38 +00:00
Paul Eggert
65da723237 Move most of contents to INSTALLME. 2002-01-24 20:16:38 +00:00
Paul Eggert
39a4929c85 Initial revision 2002-01-24 20:16:38 +00:00
Paul Eggert
6580226bf6 Initial revision 2002-01-24 02:10:11 +00:00
Paul Eggert
3f4addd972 Initial revision 2002-01-16 12:19:34 +00:00
Paul Eggert
c30fa59166 Initial revision 2002-01-05 21:13:09 +00:00
Paul Eggert
879669e496 (interact): After extracting rlen from the editor command, test for a
terminating null character, not for a newline.
2001-12-31 23:05:35 +00:00
Paul Eggert
2bc51c81cb Fix AC_CONFIG_LINKS for when symlinks are unavailable. 2001-12-31 23:05:01 +00:00
Paul Eggert
c6228a86af Allow longer source directory names without
overflowing the line length limits.  Create the cache in the
build directory, not in the source directory
2001-12-31 23:04:26 +00:00
Paul Eggert
5b9b018b29 * New diff3 and sdiff option: --diff-program=PROGRAM.
* The test-version environment variables DIFF_OPTIONS and DIFF_PROGRAM
  have been withdrawn, as they caused compatibility problems.
  You can use aliases or shell script wrappers instead.
2001-12-24 02:03:34 +00:00
Paul Eggert
c3809af86c (begin_output): Have child exit with status 127 rather than reporting
failure on its own.  Set errno to 0 before invoking popen.
(finish_output): Report errno on pclose failure.
Distinguish between subsidiary program not found, and failure.
2001-12-24 01:59:05 +00:00
Paul Eggert
1f7b77fe80 (not_found, execdiff): Remove.
(DIFF_PROGRAM_OPTION): New constant.
(longopts, option_help_msgid, main): Add --diff-program=PROGRAM.
(check_stdout): New function.
(main): Remove DIFF_PROGRAM support.  Check stdout after printing version.
Use check_stdout after printing help.  Use execvp/perror_fatail rather
than execdiff.  Set errno to 0 before invoking popen.
Check for pclose failure properly.
(main, edit): If child exec fails, exit with 127 rather than trying to
print diagnostic.
Distinguish between subsidiary program failing and not being found.
(edit): Handle signals the same way, regardless of whether we're using
system or fork+exec.  Check for system returning -1.
2001-12-24 01:55:59 +00:00
Paul Eggert
c3a98cfc02 (DIFF_PROGRAM_OPTION, HELP_OPTION): New constants.
(longopts, main): Use them.
(longopts, main, option_help_msgid): New option --diff-option=PROGRAM.
(main): Remove DIFF_PROGRAM support.
Check stdout after printing version.
(check_stdout): Report errno info if fclose fails.
(read_diff): Have child exit with status 127 when program is not found,
rather than trying to have the child report failure.  CHeck for
pclose returning -1.
2001-12-24 01:48:07 +00:00
Paul Eggert
f16be0e2b0 (DEFAULT_WIDTH): Remove.
(main): Use 130 instead of DEFAULT_WIDTH, since it's not really
builder-settable.  Do not prepend DIFF_OPTIONS.
(check-stdout): If fclose (stdout) fails, print errno info.
(option_help_msgid): Default context is 3, not 2.
(usage): Work even if ptrdiff_t is wider than int.
2001-12-24 01:44:21 +00:00
Paul Eggert
aa71c5d0fd (diff Options): Remove DIFF_OPTIONS.
(Invoking diff3, Invoking sdiff): Remove DIFF_PROGRAM.
(diff3 Options, sdiff Options): Add --diff-program.
2001-12-24 00:53:12 +00:00
Paul Eggert
5400b5e905 (valid_suffixes): Add '0', to support suffixes like "MB" and "MiB".
(check_stdout): Don't assume that the translations of "write failed"
and of "standard output" lack '%'.
(main): Check stdout after printing version.
2001-12-24 00:11:59 +00:00
Paul Eggert
e053f8c49d [HAVE_FCNTL_H && HAVE_SETMODE_DOS]: Include <fcntl.h>.
[!HAVE_SETMODE_DOS]: Do not include <unistd.h>.
(set_binary_mode): Return mode (not 1) if fd is a tty.
Do not assume that O_TEXT is zero.
2001-12-24 00:09:16 +00:00
Paul Eggert
2eb762252f (cmp Options): In byte counts, a plain suffix (without any integer)
is assumed to modify the integer 1.  Index terms like "kibibyte".
Document plain "k".

(Reporting Bugs): Mention bug-report archive and test version
location.  Ask for "diff --version" in bug reports.
2001-12-24 00:06:54 +00:00
Paul Eggert
ed5c8a4d3f (ALL_LINGUAS): Add tr. 2001-12-24 00:03:09 +00:00
Paul Eggert
26b18e2062 Latest version from self. 2001-12-22 01:48:53 +00:00
Paul Eggert
f4501e2ec5 Fix typos. 2001-12-13 19:30:37 +00:00
Paul Eggert
25dfb088db Fix comment. 2001-12-13 19:26:46 +00:00
Paul Eggert
08562bb5c3 Remove the split prevention of config.status.
Fix Sed commands for converting absolute file names into op_srcdir-relative ones.
2001-12-13 19:26:46 +00:00
Paul Eggert
510ff6559e Initial revision 2001-12-13 19:26:46 +00:00
Paul Eggert
c47d95a084 Remove jm-glibc-io.m4 2001-12-12 00:40:53 +00:00
Paul Eggert
b272bbb9bb Add --no-ignore-file-name-case.
File name case sensitivity now affects file name exclusion.
Fix typos.
2001-12-11 09:19:39 +00:00
Paul Eggert
f1db1aefd2 diffutils 2.7.5 2001-12-11 09:19:12 +00:00
Paul Eggert
c4b00134ca Include dirname.h.
(dir_file_pathname): Use base_name rather than file_name_lastdirchar.
2001-12-11 09:14:20 +00:00
Paul Eggert
05264956fc (S_IXUSR, S_IXGRP, S_IXOTH): New macros.
Include <libgettext.h> rather than rolling it ourselves.
(file_name_lastdirchar, HAVE_SETMODE, set_binary_mode): Remove.
2001-12-11 09:13:35 +00:00
Paul Eggert
33e8ec0f79 Include <dirname.h>.
(expand_name): Use base_name rather than file_name_lastdirchar, for
portability to DOS.
(main): Initialize xalloc_exit_failure before possibly invoking any memory
allocator.
2001-12-11 09:12:22 +00:00
Paul Eggert
994ba2db42 Include setmode.h. 2001-12-11 09:10:47 +00:00
Paul Eggert
e8398dcf9a (main): Initialize xalloc_exit_failure before possibly invoking any memory
allocator.
2001-12-11 09:10:14 +00:00
Paul Eggert
e3b1ff596c Include dirname.h, setmode.h.
(main): Later values and/or styles now silently override earlier.
(specify_value, specify_style): Likewise.  All callers changed.  Remove.

(binary, main, option_help_msgid, compare_files):
HAVE_SETMODE -> HAVE_SETMODE_DOS.
(NO_IGNORE_FILE_NAME_CASE_OPTION): New constant.
(longopts, main, option_help_msgid): Support it.
(exclude_options): New function.
(main): Use it. Initialize xalloc_exit_failure before potentially
allocating memory.

(filetype): Distinguish executable files from others, as POSIX suggests.

(compare_files): Use base_name instead of file_name_lastdirchar.
2001-12-11 08:30:46 +00:00
Paul Eggert
fe7c8fb737 Include <hard-locale.h>, <setmode.h>.
(hard_locale_LC_MESSAGES): New macro.
(sprintc): Remove int width arg; it's now the caller's responsibility to pad.
All callers changed.
(stat_buf): New static var; was formerly a local var in 'main'.
(valid_suffixes): Add 'K', for 'KiB'.
(option_help_msgid): Don't confuse bytes with characters.
(main): Set xalloc_exit_failure before invoking anything that might
allocate memory.  Fix bug: -n was incorrectly ignored when optimizing
the case of regular files with different lengths.
(cmp): Use an index column wide enough to store this comparison's indexes.
In locales other than the POSIX locale, say "byte" rather than "char".
2001-12-11 08:20:24 +00:00
Paul Eggert
d788533d5f pc -> ms 2001-12-11 08:12:21 +00:00
Paul Eggert
d104e14d8e Initial revision 2001-12-11 08:11:35 +00:00
Paul Eggert
412c4f3436 (noinst_HEADERS): Add dirname.h, setmode.h.
(libdiffutils_a_SOURCES): Add basename.c, setmode.c.
2001-12-11 08:09:04 +00:00
Paul Eggert
380d97d7b9 (AM_INIT_AUTOMAKE): Version 2.7.5.
(PR_PROGRAM): Use AC_DEFINE_UNQUOTED, so that $PR_PROGRAM is expanded by sh.
(ptrdiff_t, ssize_t): Use AC_CHECK_TYPE with a default of int,
not AC_CHECK_TYPES.
(jm_AC_DOS, AC_FUNC_SETMODE_DOS): New macros.
(AC_CONFIG_FILES): Add ms/Makefile.
2001-12-11 08:07:59 +00:00