Lines Matching refs:diff3
54 Detailed if-then-else, diff3 Hunks, Detailed diff3 Normal):
93 * src/diff3.c (usage): Likewise.
99 * src/diff3.c (main): Likewise.
104 * src/diff3.c (main): Likewise.
124 * src/diff3.c: Include unlocked-io.h.
202 * src/Makefile.am (diff3.$(OBJEXT), diff.$(OBJEXT),
203 sdiff.$(OBJEXT)): Rename from (misspelled) diff3.$(OBJECT),
277 * src/diff.c, src/diff3.c, src/sdiff.c: Likewise.
280 * src/diff.h, src/diff3.c, src/sdiff.c: Likewise.
410 (cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT)): Depend
414 * src/analyze.c, src/cmp.c, src/diff.c, src/diff3.c, src/io.c,
421 * src/diff.c, src/diff3.c, src/sdiff.c: Likewise.
437 * src/diff3.c (skipwhite, readnum): New functions.
487 * src/diff3.c (read_diff): Likewise.
488 * src/diff3.c: Include cmpbuf.h.
564 (cmp Options, diff Options, diff3 Options, patch Options,
567 (diff3 Options): Fix typo in description of -E, which used wrongly used
634 * src/diff3.c (option_help_msgid, usage): Likewise.
796 * src/diff3.c: Include c-stack.h, exitfail.h.
900 * src/diff3.c (copyright_string): Likewise.
913 * src/diff3.c (usage): Likewise.
920 * src/diff3.c (main): Remove unused variable.
989 * src/diff3.c (DIFF_PROGRAM_OPTION, HELP_OPTION): New constants.
1007 (Invoking diff3, Invoking sdiff): Remove DIFF_PROGRAM.
1008 (diff3 Options, sdiff Options): Add --diff-program.
1092 * src/diff3.c (main):
1170 * diff3.c (read_diff): Likewise.
1396 * src/diff3.c: Assume C89 or better.
1750 (diff.o diff3.o quotearg.o sdiff.o util.o):
1752 (diff3.o): DIFF_PROGRAM -> DEFAULT_DIFF_PROGRAM.
1896 * diff3.c (quotesys.h): Include.
2003 * cmp.c, diff.c, diff3.c, sdiff.c (main):
2045 * diff3.c (read_diff): Quote arguments with system_quote_arg.
2079 * diff3.c, sdiff.c, util.c (xmalloc, xrealloc): Remove.
2089 * diff3.c (main): Use strerror (EISDIR) instead of "Is a directory".
2114 * diff3.c (read_diff): If STAT_BLOCKSIZE yields zero,
2148 * diff3.c (main): Give proper diagnostic if too many labels were given.
2241 * diff3.c (read_diff): Use new waitpid substitute.
2243 * cmp.c, diff.c, diff3.c, sdiff.c (check_stdout, try_help): New fns.
2254 * diff.c, diff3.c, (main), sdiff.c (trapsigs): If we'll have children,
2257 * diff3.c (DIFF_CHUNK_SIZE): Removed. Get size from STAT_BLOCKSIZE.
2269 * cmp.c, diff.c, diff3.c, sdiff.c, (main): Call initialize_main first.
2278 * diff3.c (read_diff), sdiff.c (cleanup, main, waitpid),
2304 * diff3.c (scan_diff_line), util.c (print_number_range): Don't
2360 * diff3.c (usage): Send usage to stdout, not stderr.
2392 * diff3.c (xmalloc, xrealloc): Cast malloc, realloc
2415 * diff3.c, sdiff.c, util.c (xmalloc, xrealloc): Cast malloc, realloc
2434 * Makefile.in (diff3, sdiff, cmp): Do not link $(ALLOCA).
2452 * cmp.c, diff3.c, diff.h, sdiff.c: Include "system.h" first.
2455 * diff3.c (xmalloc): Now static.
2475 (.c.o, diff3.o, sdiff.o): Use it.
2595 * diff3.c (VOID): Move to system.h.
2681 * analyze.c, diff3.c, sdiff.c, util.c: Don't assume NULL is defined
2698 * diff3.c (tab_align_flag): New variable, for new -T option.
2725 * diff3.c (main, process_diff, read_diff): Invoke second diff
2727 * diff.h, diff3.c (horizon_lines): New variable.
2768 * diff3.c (xmalloc): No longer static.
2780 * Makefile.in (.c.o, diff3.o, sdiff.o): Put $(CFLAGS) last.
2834 * diff3.c (usage): Add third --label option in example.
2842 * diff3.c (main, usage): Add -A or --show-all.
2868 * diff3.c (main, make_3way_diff, using_to_diff3_block): Don't
2872 option.) Always compare file1 to file2, so that diff3 sees
2880 * diff3.c (using_to_diff3_block): Fold repeated code into loops.
2882 * diff3.c (make_3way_diff, process_diff): Have the *_end
2886 * diff3.c (process_diff): Use D_NUMLINES instead of its definiens.
2888 * diff3.c: Make fns and vars static unless they must be external.
3108 * diff3: Add -v --version option.
3112 * diff.h, cmp.c, diff3.c, sdiff.c: Use it.
3114 * diff.h, diff3.c: Include string.h or strings.h, as appropriate.
3117 * diff3.c (perror_with_exit): Include program name in message.
3119 * diff3.c: Lowercase error messages for GNU standards.
3134 * diff3.c (main, usage): Add long-named options.
3138 * diff.h, diff3.c, sdiff.c: Change FOO_MISSING macros to HAVE_FOO.
3150 * io.c, diff3.c, analyze.c: Add extra parentheses.
3171 * diff.h, diff3.c, sdiff.c: Change POSIX ifdefs to
3179 * diff.h, diff3.c, sdiff.c: Use HAVE_VFORK_H instead of
3191 * configure, diff.c, diff.h, diff3.c, sdiff.c:
3243 * diff.h, diff3.c: Rearrange ifdefs to use POSIX,
3291 * Makefile (diff3): Link with GNU getopt.
3322 * diff3.c (main): Don't get confused if one of the arguments
3338 * diff3.c (read_diff): Don't assume things about the order of
3410 * diff3.c (WIFEXITED): Undef it if WEXITSTATUS is not defined.
3425 * diff3.c (main): Recognize -L instead of -t.
3427 * diff3.c (main): Support -m without other option.
3429 * diff3.c (WEXITSTATUS, WIFEXITED): Define whenever not defined.
3431 * diff3.c (bcopy, index, rindex): Delete definitions; not used.
3437 Pass -a to diff if given to diff3.
3501 * diff3.c (xmalloc, xrealloc): Don't die if size == 0 returns 0.
3530 * diff3.c (read_diff): Pass -- as first arg to diff.
3532 * diff3.c: Include wait.h or define equivalent macros.
3539 * diff3.c (main): Accept -t options and pass to output_diff3_edscript.
3548 * diff3.c (dup2): Don't define on Xenix.
3558 * diff.h, util.c, diff3.c: Change 'void *' to 'VOID *', with
3582 * diff3.c (fatal): Output to stderr.
3590 * diff3.c (output_diff3_edscript): Return number of overlaps.
3627 * diff3.c (using_to_diff3_block): Delete unused vars.
3646 * diff3.c (using_to_diff3_block): When defaulting lines from
3650 * diff3.c (fatal): Add \n to error messages.
3658 * diff3.c (process_diff, create_diff3_block): Init ->next field.
3739 * diff3.c [USG]: Include fcntl.h.
3758 * diff3.c (using_to_diff3_block): Now find high marks in files 1
3762 * diff3.c: Many trivial changes to spelling inside comments.
3769 * diff3.c: Changed copyright header to conform with new GNU
3781 * diff3.c (message) Re-wrote routine to avoid using alloca()
3843 * Makefile: Added a define for diff3 to define DIFF_PROGRAM.
3851 * diff3.c: Included USG compatibility defines.