Lines Matching refs:diff3
27 * src/diff3.c (read_diff): Likewise.
28 * src/diff3.c: Include cmpbuf.h.
104 (cmp Options, diff Options, diff3 Options, patch Options,
107 (diff3 Options): Fix typo in description of -E, which used wrongly used
174 * src/diff3.c (option_help_msgid, usage): Likewise.
336 * src/diff3.c: Include c-stack.h, exitfail.h.
440 * src/diff3.c (copyright_string): Likewise.
448 * src/diff3.c (usage): Likewise.
451 * src/diff3.c (main): Remove unused variable.
520 * src/diff3.c (DIFF_PROGRAM_OPTION, HELP_OPTION): New constants.
538 (Invoking diff3, Invoking sdiff): Remove DIFF_PROGRAM.
539 (diff3 Options, sdiff Options): Add --diff-program.
623 * src/diff3.c (main):
701 * diff3.c (read_diff): Likewise.
927 * src/diff3.c: Assume C89 or better.
1281 (diff.o diff3.o quotearg.o sdiff.o util.o):
1283 (diff3.o): DIFF_PROGRAM -> DEFAULT_DIFF_PROGRAM.
1427 * diff3.c (quotesys.h): Include.
1534 * cmp.c, diff.c, diff3.c, sdiff.c (main):
1576 * diff3.c (read_diff): Quote arguments with system_quote_arg.
1610 * diff3.c, sdiff.c, util.c (xmalloc, xrealloc): Remove.
1620 * diff3.c (main): Use strerror (EISDIR) instead of "Is a directory".
1645 * diff3.c (read_diff): If STAT_BLOCKSIZE yields zero,
1679 * diff3.c (main): Give proper diagnostic if too many labels were given.
1772 * diff3.c (read_diff): Use new waitpid substitute.
1774 * cmp.c, diff.c, diff3.c, sdiff.c (check_stdout, try_help): New fns.
1785 * diff.c, diff3.c, (main), sdiff.c (trapsigs): If we'll have children,
1788 * diff3.c (DIFF_CHUNK_SIZE): Removed. Get size from STAT_BLOCKSIZE.
1800 * cmp.c, diff.c, diff3.c, sdiff.c, (main): Call initialize_main first.
1809 * diff3.c (read_diff), sdiff.c (cleanup, main, waitpid),
1835 * diff3.c (scan_diff_line), util.c (print_number_range): Don't
1891 * diff3.c (usage): Send usage to stdout, not stderr.
1923 * diff3.c (xmalloc, xrealloc): Cast malloc, realloc
1946 * diff3.c, sdiff.c, util.c (xmalloc, xrealloc): Cast malloc, realloc
1965 * Makefile.in (diff3, sdiff, cmp): Do not link $(ALLOCA).
1983 * cmp.c, diff3.c, diff.h, sdiff.c: Include "system.h" first.
1986 * diff3.c (xmalloc): Now static.
2006 (.c.o, diff3.o, sdiff.o): Use it.
2126 * diff3.c (VOID): Move to system.h.
2212 * analyze.c, diff3.c, sdiff.c, util.c: Don't assume NULL is defined
2229 * diff3.c (tab_align_flag): New variable, for new -T option.
2256 * diff3.c (main, process_diff, read_diff): Invoke second diff
2258 * diff.h, diff3.c (horizon_lines): New variable.
2299 * diff3.c (xmalloc): No longer static.
2311 * Makefile.in (.c.o, diff3.o, sdiff.o): Put $(CFLAGS) last.
2365 * diff3.c (usage): Add third --label option in example.
2373 * diff3.c (main, usage): Add -A or --show-all.
2399 * diff3.c (main, make_3way_diff, using_to_diff3_block): Don't
2403 option.) Always compare file1 to file2, so that diff3 sees
2411 * diff3.c (using_to_diff3_block): Fold repeated code into loops.
2413 * diff3.c (make_3way_diff, process_diff): Have the *_end
2417 * diff3.c (process_diff): Use D_NUMLINES instead of its definiens.
2419 * diff3.c: Make fns and vars static unless they must be external.
2639 * diff3: Add -v --version option.
2643 * diff.h, cmp.c, diff3.c, sdiff.c: Use it.
2645 * diff.h, diff3.c: Include string.h or strings.h, as appropriate.
2648 * diff3.c (perror_with_exit): Include program name in message.
2650 * diff3.c: Lowercase error messages for GNU standards.
2665 * diff3.c (main, usage): Add long-named options.
2669 * diff.h, diff3.c, sdiff.c: Change FOO_MISSING macros to HAVE_FOO.
2681 * io.c, diff3.c, analyze.c: Add extra parentheses.
2702 * diff.h, diff3.c, sdiff.c: Change POSIX ifdefs to
2710 * diff.h, diff3.c, sdiff.c: Use HAVE_VFORK_H instead of
2722 * configure, diff.c, diff.h, diff3.c, sdiff.c:
2774 * diff.h, diff3.c: Rearrange ifdefs to use POSIX,
2822 * Makefile (diff3): Link with GNU getopt.
2853 * diff3.c (main): Don't get confused if one of the arguments
2869 * diff3.c (read_diff): Don't assume things about the order of
2941 * diff3.c (WIFEXITED): Undef it if WEXITSTATUS is not defined.
2956 * diff3.c (main): Recognize -L instead of -t.
2958 * diff3.c (main): Support -m without other option.
2960 * diff3.c (WEXITSTATUS, WIFEXITED): Define whenever not defined.
2962 * diff3.c (bcopy, index, rindex): Delete definitions; not used.
2968 Pass -a to diff if given to diff3.
3032 * diff3.c (xmalloc, xrealloc): Don't die if size == 0 returns 0.
3061 * diff3.c (read_diff): Pass -- as first arg to diff.
3063 * diff3.c: Include wait.h or define equivalent macros.
3070 * diff3.c (main): Accept -t options and pass to output_diff3_edscript.
3079 * diff3.c (dup2): Don't define on Xenix.
3089 * diff.h, util.c, diff3.c: Change 'void *' to 'VOID *', with
3113 * diff3.c (fatal): Output to stderr.
3121 * diff3.c (output_diff3_edscript): Return number of overlaps.
3158 * diff3.c (using_to_diff3_block): Delete unused vars.
3177 * diff3.c (using_to_diff3_block): When defaulting lines from
3181 * diff3.c (fatal): Add \n to error messages.
3189 * diff3.c (process_diff, create_diff3_block): Init ->next field.
3270 * diff3.c [USG]: Include fcntl.h.
3289 * diff3.c (using_to_diff3_block): Now find high marks in files 1
3293 * diff3.c: Many trivial changes to spelling inside comments.
3300 * diff3.c: Changed copyright header to conform with new GNU
3312 * diff3.c (message) Re-wrote routine to avoid using alloca()
3374 * Makefile: Added a define for diff3 to define DIFF_PROGRAM.
3382 * diff3.c: Included USG compatibility defines.