Lines Matching refs:diff3
17 * diff3.c (read_diff): If STAT_BLOCKSIZE yields zero,
51 * diff3.c (main): Give proper diagnostic if too many labels were given.
144 * diff3.c (read_diff): Use new waitpid substitute.
146 * cmp.c, diff.c, diff3.c, sdiff.c (check_stdout, try_help): New fns.
157 * diff.c, diff3.c, (main), sdiff.c (trapsigs): If we'll have children,
160 * diff3.c (DIFF_CHUNK_SIZE): Removed. Get size from STAT_BLOCKSIZE.
172 * cmp.c, diff.c, diff3.c, sdiff.c, (main): Call initialize_main first.
181 * diff3.c (read_diff), sdiff.c (cleanup, main, waitpid),
207 * diff3.c (scan_diff_line), util.c (print_number_range): Don't
263 * diff3.c (usage): Send usage to stdout, not stderr.
295 * diff3.c (xmalloc, xrealloc): Cast malloc, realloc
318 * diff3.c, sdiff.c, util.c (xmalloc, xrealloc): Cast malloc, realloc
337 * Makefile.in (diff3, sdiff, cmp): Do not link $(ALLOCA).
355 * cmp.c, diff3.c, diff.h, sdiff.c: Include "system.h" first.
358 * diff3.c (xmalloc): Now static.
378 (.c.o, diff3.o, sdiff.o): Use it.
498 * diff3.c (VOID): Move to system.h.
584 * analyze.c, diff3.c, sdiff.c, util.c: Don't assume NULL is defined
601 * diff3.c (tab_align_flag): New variable, for new -T option.
628 * diff3.c (main, process_diff, read_diff): Invoke second diff
630 * diff.h, diff3.c (horizon_lines): New variable.
671 * diff3.c (xmalloc): No longer static.
683 * Makefile.in (.c.o, diff3.o, sdiff.o): Put $(CFLAGS) last.
737 * diff3.c (usage): Add third --label option in example.
745 * diff3.c (main, usage): Add -A or --show-all.
771 * diff3.c (main, make_3way_diff, using_to_diff3_block): Don't
775 option.) Always compare file1 to file2, so that diff3 sees
783 * diff3.c (using_to_diff3_block): Fold repeated code into loops.
785 * diff3.c (make_3way_diff, process_diff): Have the *_end
789 * diff3.c (process_diff): Use D_NUMLINES instead of its definiens.
791 * diff3.c: Make fns and vars static unless they must be external.
1011 * diff3: Add -v --version option.
1015 * diff.h, cmp.c, diff3.c, sdiff.c: Use it.
1017 * diff.h, diff3.c: Include string.h or strings.h, as appropriate.
1020 * diff3.c (perror_with_exit): Include program name in message.
1022 * diff3.c: Lowercase error messages for GNU standards.
1037 * diff3.c (main, usage): Add long-named options.
1041 * diff.h, diff3.c, sdiff.c: Change FOO_MISSING macros to HAVE_FOO.
1053 * io.c, diff3.c, analyze.c: Add extra parentheses.
1074 * diff.h, diff3.c, sdiff.c: Change POSIX ifdefs to
1082 * diff.h, diff3.c, sdiff.c: Use HAVE_VFORK_H instead of
1094 * configure, diff.c, diff.h, diff3.c, sdiff.c:
1146 * diff.h, diff3.c: Rearrange ifdefs to use POSIX,
1194 * Makefile (diff3): Link with GNU getopt.
1225 * diff3.c (main): Don't get confused if one of the arguments
1241 * diff3.c (read_diff): Don't assume things about the order of
1313 * diff3.c (WIFEXITED): Undef it if WEXITSTATUS is not defined.
1328 * diff3.c (main): Recognize -L instead of -t.
1330 * diff3.c (main): Support -m without other option.
1332 * diff3.c (WEXITSTATUS, WIFEXITED): Define whenever not defined.
1334 * diff3.c (bcopy, index, rindex): Delete definitions; not used.
1340 Pass -a to diff if given to diff3.
1404 * diff3.c (xmalloc, xrealloc): Don't die if size == 0 returns 0.
1433 * diff3.c (read_diff): Pass -- as first arg to diff.
1435 * diff3.c: Include wait.h or define equivalent macros.
1442 * diff3.c (main): Accept -t options and pass to output_diff3_edscript.
1451 * diff3.c (dup2): Don't define on Xenix.
1461 * diff.h, util.c, diff3.c: Change 'void *' to 'VOID *', with
1485 * diff3.c (fatal): Output to stderr.
1493 * diff3.c (output_diff3_edscript): Return number of overlaps.
1530 * diff3.c (using_to_diff3_block): Delete unused vars.
1549 * diff3.c (using_to_diff3_block): When defaulting lines from
1553 * diff3.c (fatal): Add \n to error messages.
1561 * diff3.c (process_diff, create_diff3_block): Init ->next field.
1642 * diff3.c [USG]: Include fcntl.h.
1661 * diff3.c (using_to_diff3_block): Now find high marks in files 1
1665 * diff3.c: Many trivial changes to spelling inside comments.
1672 * diff3.c: Changed copyright header to conform with new GNU
1684 * diff3.c (message) Re-wrote routine to avoid using alloca()
1746 * Makefile: Added a define for diff3 to define DIFF_PROGRAM.
1754 * diff3.c: Included USG compatibility defines.