Lines Matching refs:diff
48 * diff.h (PR_FILE_NAME): Rename to PR_PROGRAM and move to Makefile.in,
61 * diff.c: Add comment.
63 * util.c (PR_PROGRAM): Moved here from diff.h.
113 * diff.c, diff.h (ignore_some_line_changes):
146 * cmp.c, diff.c, diff3.c, sdiff.c (check_stdout, try_help): New fns.
148 * diff.c (option_help): New variable.
157 * diff.c, diff3.c, (main), sdiff.c (trapsigs): If we'll have children,
172 * cmp.c, diff.c, diff3.c, sdiff.c, (main): Call initialize_main first.
173 * diff.c (binary_I_O): New variable for --binary option.
177 * cmp.c (main), diff.c (compare_files), dir.c (compare_names,
197 * Makefile.in (info, dvi, diff.dvi): New targets.
224 * diff.c (main): allow -pu.
246 * diff.c (long_options, main, usage): Add `--help'.
277 * diff.c (add_exclude_file): Cast memchr to (char *)
314 * diff.c (add_exclude_file): Cast memchr to (char *)
355 * cmp.c, diff3.c, diff.h, sdiff.c: Include "system.h" first.
356 * diff.c: Remove redundant "system.h" inclusion.
382 * diff.c (main, longopts): Add --line-format=FORMAT option.
396 * diff.h (group_format, line_format): No longer const pointers.
413 * diff.c (compare_files): Two files with the same name must be
474 * diff.c (usage): Sort options.
488 * diff.h (Is_space, textchar): Remove.
494 * diff.texi:
508 * io.c (line_cmp): Move declaration to diff.h.
514 Move decls to diff.h.
541 (VOID): Move here from diff.h.
543 * util.c (struct msg, msg_chain, msg_chain_end): Moved here from diff.h.
582 * diff.c (main): Cast args to compare_files, for traditional C.
592 * diff.h (ignore_some_changes): New variable.
593 * diff.c (compare_files): Don't use the file size shortcut if
610 * Makefile.in (dist): Change name of package from diff to diffutils.
615 * diff.c: Include "system.h" to get memchr declaration.
627 * diff.c (main, longopts, usage): Add --horizon-lines option.
628 * diff3.c (main, process_diff, read_diff): Invoke second diff
629 with --horizon-lines determined by the first diff.
630 * diff.h, diff3.c (horizon_lines): New variable.
639 * diff.c (main): Use NULL in arg to compare_files.
728 * diff.c (compare_files): Pass struct file_data to diff_dirs.
735 * diff.c (main): Add `-U lines' as an alias for `--unified=lines'.
774 (This is entirely possible since we don't use diff's -n
796 * diff.h (ROBUST_OUTPUT_STYLE): Likewise.
804 * diff.c (longopts, main): --{old,new,unchanged,changed}--group-format
807 * diff.h (enum line_class): New type.
815 * diff.c (main, usage): Replace --line-prefix with the more general
818 * diff.h (line_format): Renamed from line_prefix. All refs changed.
819 * diff.h, ifdef.c (default_line_format): New variable.
827 * diff.c (main): Add -E or --line-prefix option. Add -D'=xxx'
830 * diff.h (common_format, line_prefix): New variables.
838 with traditional diff.
852 * diff.c (main): Support new -D options for if-then-else formats.
854 * diff.h (ifndef_format, ifdef_format, ifnelse_format): New variables.
861 * sdiff.c (interact): Don't assume diff output ends with 'q' line.
862 * diff.h (ROBUST_OUTPUT_STYLE): OUTPUT_SDIFF is now robust.
886 * util.c, diff.h, system.h [!HAVE_MEMCHR]: Don't use void *
894 * diff.c (excluded_filename): Use fnmatch, not wildmat.
901 * diff.h, util.c: Use it instead of MEMCHR_MISSING.
905 * diff.h: (struct line_def): Replace this 3-word struct with char *.
918 * ed.c (print_ed_hunk): Adjust to diff.h's struct changes.
930 Use only one buffer for stdin with `diff - -'.
934 * diff.c (add_exclude, add_exclude_file, excluded_filename): New fns.
937 Treat `diff file file' and `diff file dir' similarly.
956 needed. Work even if the buffers are the same (because of `diff - -').
961 Don't copy stdin buffer if `diff - -'.
992 * diff.h: Don't declare free, index, rindex.
1002 * diff.h: Replace function_regexp and ignore_regexp with lists
1008 * diff.c (add_regexp): New function.
1015 * diff.h, cmp.c, diff3.c, sdiff.c: Use it.
1017 * diff.h, diff3.c: Include string.h or strings.h, as appropriate.
1032 * diff.c (longopts): --unidirectional-new-file is like -P, not -N.
1035 * sdiff.c, diff.c (usage): Condense messages and fix some errors.
1041 * diff.h, diff3.c, sdiff.c: Change FOO_MISSING macros to HAVE_FOO.
1045 * diff.c: --reversed-ed -> --forward-ed.
1049 * analyze.c, diff.c, diff.h, io.c: For -y, compare even if same file.
1057 * diff.h (unidirectional_new_file_flag): New variable.
1058 * diff.c (main): Set that for -P.
1064 * Makefile.in: Distribute diff.info-* too.
1070 * ifdef.c: Don't dump core if `diff -Dx f f'.
1074 * diff.h, diff3.c, sdiff.c: Change POSIX ifdefs to
1080 (tapefiles): Add diff.texi and diff.info.
1082 * diff.h, diff3.c, sdiff.c: Use HAVE_VFORK_H instead of
1087 * Makefile.in (all): Add diff.info, sdiff.
1089 * configure, diff.c, sdiff.c:
1091 * diff.c: Regularize option names.
1094 * configure, diff.c, diff.h, diff3.c, sdiff.c:
1098 * diff.c, diff.h, side.c: Calculate column widths so that tabs line up.
1104 * sdiff.c: Support many more diff options, e.g. `-', `sdiff file dir'.
1106 Clean up temporary file and kill subsidiary diff if interrupted.
1107 Ensure subsidiary diff doesn't ignore SIGPIPE.
1119 * Makefile.in, sdiff.c: introduced sdiff front end to diff.
1121 * Makefile.in, analyze.c, diff.c, diff.h, io.c, side.c: Added
1122 sdiff-style output format to diff.
1146 * diff.h, diff3.c: Rearrange ifdefs to use POSIX,
1182 * diff.h (TRUE, FALSE): Undefine these before defining.
1190 * diff.h: Include regex.h.
1200 * diff.h (files): Add EXTERN.
1204 * diff.c: +print option renamed +paginate. Remove +all-text.
1208 * Makefile (dist): New target, replacing diff.tar and
1209 diff.tar.Z, to encode version number in distribution directory
1228 * diff.c (compare_files): Don't get confused if comparing
1232 print_context_script), diff.c (main), diff.h (enum
1237 * diff.c (main): Better error messages when regexps are bad.
1239 * diff.c (compare_files): Don't assume stdin is opened.
1247 * diff.c (compare_files): Set a flag so that closes don't
1250 * diff.c (main): Don't just flush stdout, do a close. That
1255 * diff.c (usage): Use = for args of long options.
1267 * diff.c (longopts, usage): unidiff => unified.
1273 * diff.c (pr_unidiff_hunk): Remove ref to output_patch_flag.
1277 * diff.c (compare_files): For -D, compare even args are same file.
1287 * diff.c (usage): Return 2.
1291 * diff.c (longopts): Add +new-files.
1298 * diff.c (longopts): Add element for +unidiff.
1318 * diff.h (O_RDONLY): Define if not defined.
1325 * diff.c (main): Recognize the option.
1327 * diff.h (file_label): New variable.
1340 Pass -a to diff if given to diff3.
1344 No need to check validity of diff output here.
1356 (process_diff): Better error message for bad diff format.
1376 * diff.h (ROBUST_OUTPUT_STYLE): New macro.
1379 * diff.h (dup2): Don't define if XENIX.
1381 * diff.c (main): Check for write error at end.
1402 * diff.h (NDIR_IN_SYS): New macro controls location of ndir.h.
1433 * diff3.c (read_diff): Pass -- as first arg to diff.
1447 * diff.h (vfork): Don't use it on Sparc.
1461 * diff.h, util.c, diff3.c: Change 'void *' to 'VOID *', with
1489 * diff.c (usage): Mention -v.
1502 * diff.c (main): -v prints version number.
1522 * diff.h: Don't declare xcalloc. Declare some other functions.
1539 * diff.c (usage): Mention -D.
1545 * diff.c (compare_files): Don't fflush for identical files.
1551 in the next diff.
1569 * Makefile (diff.tar): Expect ln to fail on some files;
1576 * diff.c (main): Handle -D option.
1582 * diff.c (option_list): Rename arg VECTOR as OPTIONVEC.
1586 * diff.c (compare_files): Clear entire inf[i].stat.
1596 * diff.c (main): Detect -q, record in no_details_flag.
1600 * diff.c (usage): New function.
1605 * diff.c (main): Make -C imply -c.
1644 * diff.h [USG]: New compilation flags HAVE_NDIR, HAVE_DIRECT.
1651 * diff.c (compare_files): Pass those args.
1669 * util.c, normal.c, io.c, ed.c, dir.c, diff.h, diff.c, context.c,
1699 * diff.c (main): -C now takes arg to specify context length.
1730 * diff.c (compare_files): Don't open directories.
1736 * diff.h: Declare index, rindex.
1738 * diff.c (compare_files): If comparing foodir with b/f,
1741 * diff.c (compare_files): Don't print "are identical" msg for 2 dirs.
1751 * diff.c: Changed S_IFDIR to S_IFMT in masking type of file bits
1756 * diff.h: Moved sys/file.h into #else USG section (not needed or