Lines Matching full:diff

47 	* doc/diff.texi (dircategory): Change to "Text creation and
51 (Binary): -q doesn't exactly cause diff to assume files are binary.
62 (diff Options): Add --strip-trailing-cr.
84 * src/analyze.c, src/context.c, src/diff.c, src/io.c, src/util.c:
85 Do not include regex.h, as diff.h does this now.
92 * src/diff.c (option_help_msgid): Likewise.
98 * src/diff.c (main): Likewise.
103 * src/diff.c (main): Likewise.
107 * src/diff.c: Include <exit.h>.
119 * src/diff.h: Include regex.h, unlocked-io.h.
202 * src/Makefile.am (diff3.$(OBJEXT), diff.$(OBJEXT),
204 diff.$(OBJECT), sdiff.$(OBJECT). Patch by Paul D. Smith in
249 * doc/diff.texi (Special Files): Document behavior of symlink
277 * src/diff.c, src/diff3.c, src/sdiff.c: Likewise.
280 * src/diff.h, src/diff3.c, src/sdiff.c: Likewise.
312 * doc/diff.texi: Reword "@option{-f} and @option{--foo}" to
319 (Tabs, sdiff Option Summary, diff Options):
356 that was in src/diff.c, but is now librarified and spiffed up a
406 * src/Makefile.am (noinst_HEADERS): Remove diff.h.
408 (diff_sources): Add diff.h.
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.
423 * src/diff.c: Include posixver.h.
429 * src/diff.c (longopts, main, usage): New option --tabsize=COLUMNS.
432 * src/diff.h (TAB_WIDTH): Remove.
494 * doc/diff.texi:
514 * doc/diff.texi (dircategory GNU packages): Fix typo: a "* " was
530 * doc/diff.texi: Upgrade the description of `patch' to GNU patch
533 * src/diff.c (main): Fix typo that prevented diff -y from working.
550 Deprecate diff -h, -H, -L, -P, --inhibit-hunk-merge.
555 * doc/diff.texi (Overview): byte != character.
556 (Detailed Context, Detailed Unified, Alternate Names, diff Options):
557 Do not document diff -L.
558 (Comparing Directories, Making Patches, diff Options):
559 Do not document diff -P.
560 (diff Performance, sdiff Option Summary, diff Options, sdiff Options):
561 Do not document diff -H.
562 (diff Performance, diff Options): Do not document --horizon-lines.
564 (cmp Options, diff Options, diff3 Options, patch Options,
584 * src/diff.c (option_help_msgid): Do not document -L, -P,
586 * src/diff.h: -L -> --label
596 Change package name from diff to diffutils.
633 * src/diff.c (option_help_msgid): Likewise.
660 * doc/diff.texi: Add vr index.
670 (diff Options): Deprecate -LINES, as POSIX 1003.1-2001 does not
770 * src/diff.h: unsigned -> unsigned int.
771 * src/diff.c: Include c-stack.h, exitfail.h.
880 (AC_CONFIG_SRCDIR): Specify src/diff.c here, not in AC_INIT.
899 * src/diff.c (copyright_string): Likewise.
977 (longopts, option_help_msgid, main): Add --diff-program=PROGRAM.
991 (longopts, main, option_help_msgid): New option --diff-option=PROGRAM.
999 * src/diff.c (DEFAULT_WIDTH): Remove.
1006 * doc/diff.texi (diff Options): Remove DIFF_OPTIONS.
1008 (diff3 Options, sdiff Options): Add --diff-program.
1021 * doc/diff.texi (cmp Options):
1027 location. Ask for "diff --version" in bug reports.
1031 * src/diff.c (DEFAULT_WIDTH): Remove; couldn't be changed without
1057 * diff.c (option_help_msgid): Correct the default context width
1073 * doc/diff.texi: Add --no-ignore-file-name-case.
1096 * src/diff.c: Include dirname.h, setmode.h.
1150 * diff.texi (direntry, Overview, Comparison, Binary, Invoking cmp):
1160 Define to "diff", not "$bindir/diff" (which didn't work anyway).
1212 * diff.c (main, compare_files): setmode -> set_binary_mode.
1241 * doc/diff.texi: offsets -> indices for cmp
1245 * src/diff.c (option_help_msgid):
1252 * doc/diff.texi: Change direcategory from Utilities to GNU Packages.
1412 Rename "DIFF" to "DIFF_PROGRAM".
1417 However, use file2 as the common file if this is a 3-way diff,
1431 * src/diff.h: Assume C89 or better.
1485 * src/diff.c: Assume C89 or better.
1611 * lib/freesoft.c: Include config.h, freesoft.h rather than diff.h.
1635 Use src/diff.c, not diff.h, as the source files got removed.
1734 * diff.texi: Add @dircategory and @direntry.
1749 (diff.dvi): Depend on version.texi.
1750 (diff.o diff3.o quotearg.o sdiff.o util.o):
1760 (check): Set DIFF.
1777 * diff.h (XTERN): Renamed from EXTERN.
1810 * diff.c (authorship_msgid): New var.
1874 (main): Set static vars for editor and diff program.
1904 (main): Use DIFF environment var to specify name of diff program.
1912 (read_diff): Invoke diff with --inhibit-hunk-merge.
1914 Quote name of diff program.
1934 * diff.texi: Document recent changes.
1976 pc/emx/config.h, pc/emx/diff.def, pc/emx/gnuregex.def,
1986 (diff.info): Now depends on version.texi.
1998 * diff.c (compare_files): Likewise.
2003 * cmp.c, diff.c, diff3.c, sdiff.c (main):
2013 * diff.c (main): -D FOO now outputs `/* ! FOO */ instead of
2032 * diff.h (function_regexp, ignore_regexp): Replace lists of compiled
2034 (regexp_list,function_regexp_list,ignore_regexp_list): Move to diff.c.
2035 * diff.c (add_regexp): Build one big regexp instead of a regexp list.
2037 (regexp_list): Redesigned struct; moved here from diff.h.
2047 * diff.c (option_list): Quote options with system_quote_arg.
2063 speeds up diff -i considerably on some hosts (e.g. Solaris 2.3).
2067 * diff.h (ignore_some_line_changes): Remove. All users changed.
2071 * diff.h (xmalloc_exit_failure): New variable.
2076 * diff.c (add_exclude): Can now assume xrealloc (0, ...) works.
2088 * diff.h (error): Change to GNU library standard. All callers changed.
2145 * diff.h (PR_FILE_NAME): Rename to PR_PROGRAM and move to Makefile.in,
2158 * diff.c: Add comment.
2160 * util.c (PR_PROGRAM): Moved here from diff.h.
2210 * diff.c, diff.h (ignore_some_line_changes):
2243 * cmp.c, diff.c, diff3.c, sdiff.c (check_stdout, try_help): New fns.
2245 * diff.c (option_help): New variable.
2254 * diff.c, diff3.c, (main), sdiff.c (trapsigs): If we'll have children,
2269 * cmp.c, diff.c, diff3.c, sdiff.c, (main): Call initialize_main first.
2270 * diff.c (binary_I_O): New variable for --binary option.
2274 * cmp.c (main), diff.c (compare_files), dir.c (compare_names,
2294 * Makefile.in (info, dvi, diff.dvi): New targets.
2321 * diff.c (main): allow -pu.
2343 * diff.c (long_options, main, usage): Add `--help'.
2374 * diff.c (add_exclude_file): Cast memchr to (char *)
2411 * diff.c (add_exclude_file): Cast memchr to (char *)
2452 * cmp.c, diff3.c, diff.h, sdiff.c: Include "system.h" first.
2453 * diff.c: Remove redundant "system.h" inclusion.
2479 * diff.c (main, longopts): Add --line-format=FORMAT option.
2493 * diff.h (group_format, line_format): No longer const pointers.
2510 * diff.c (compare_files): Two files with the same name must be
2571 * diff.c (usage): Sort options.
2585 * diff.h (Is_space, textchar): Remove.
2591 * diff.texi:
2605 * io.c (line_cmp): Move declaration to diff.h.
2611 Move decls to diff.h.
2638 (VOID): Move here from diff.h.
2640 * util.c (struct msg, msg_chain, msg_chain_end): Moved here from diff.h.
2679 * diff.c (main): Cast args to compare_files, for traditional C.
2689 * diff.h (ignore_some_changes): New variable.
2690 * diff.c (compare_files): Don't use the file size shortcut if
2707 * Makefile.in (dist): Change name of package from diff to diffutils.
2712 * diff.c: Include "system.h" to get memchr declaration.
2724 * diff.c (main, longopts, usage): Add --horizon-lines option.
2725 * diff3.c (main, process_diff, read_diff): Invoke second diff
2726 with --horizon-lines determined by the first diff.
2727 * diff.h, diff3.c (horizon_lines): New variable.
2736 * diff.c (main): Use NULL in arg to compare_files.
2825 * diff.c (compare_files): Pass struct file_data to diff_dirs.
2832 * diff.c (main): Add `-U lines' as an alias for `--unified=lines'.
2871 (This is entirely possible since we don't use diff's -n
2893 * diff.h (ROBUST_OUTPUT_STYLE): Likewise.
2901 * diff.c (longopts, main): --{old,new,unchanged,changed}--group-format
2904 * diff.h (enum line_class): New type.
2912 * diff.c (main, usage): Replace --line-prefix with the more general
2915 * diff.h (line_format): Renamed from line_prefix. All refs changed.
2916 * diff.h, ifdef.c (default_line_format): New variable.
2924 * diff.c (main): Add -E or --line-prefix option. Add -D'=xxx'
2927 * diff.h (common_format, line_prefix): New variables.
2935 with traditional diff.
2949 * diff.c (main): Support new -D options for if-then-else formats.
2951 * diff.h (ifndef_format, ifdef_format, ifnelse_format): New variables.
2958 * sdiff.c (interact): Don't assume diff output ends with 'q' line.
2959 * diff.h (ROBUST_OUTPUT_STYLE): OUTPUT_SDIFF is now robust.
2983 * util.c, diff.h, system.h [!HAVE_MEMCHR]: Don't use void *
2991 * diff.c (excluded_filename): Use fnmatch, not wildmat.
2998 * diff.h, util.c: Use it instead of MEMCHR_MISSING.
3002 * diff.h: (struct line_def): Replace this 3-word struct with char *.
3015 * ed.c (print_ed_hunk): Adjust to diff.h's struct changes.
3027 Use only one buffer for stdin with `diff - -'.
3031 * diff.c (add_exclude, add_exclude_file, excluded_filename): New fns.
3034 Treat `diff file file' and `diff file dir' similarly.
3053 needed. Work even if the buffers are the same (because of `diff - -').
3058 Don't copy stdin buffer if `diff - -'.
3089 * diff.h: Don't declare free, index, rindex.
3099 * diff.h: Replace function_regexp and ignore_regexp with lists
3105 * diff.c (add_regexp): New function.
3112 * diff.h, cmp.c, diff3.c, sdiff.c: Use it.
3114 * diff.h, diff3.c: Include string.h or strings.h, as appropriate.
3129 * diff.c (longopts): --unidirectional-new-file is like -P, not -N.
3132 * sdiff.c, diff.c (usage): Condense messages and fix some errors.
3138 * diff.h, diff3.c, sdiff.c: Change FOO_MISSING macros to HAVE_FOO.
3142 * diff.c: --reversed-ed -> --forward-ed.
3146 * analyze.c, diff.c, diff.h, io.c: For -y, compare even if same file.
3154 * diff.h (unidirectional_new_file_flag): New variable.
3155 * diff.c (main): Set that for -P.
3161 * Makefile.in: Distribute diff.info-* too.
3167 * ifdef.c: Don't dump core if `diff -Dx f f'.
3171 * diff.h, diff3.c, sdiff.c: Change POSIX ifdefs to
3177 (tapefiles): Add diff.texi and diff.info.
3179 * diff.h, diff3.c, sdiff.c: Use HAVE_VFORK_H instead of
3184 * Makefile.in (all): Add diff.info, sdiff.
3186 * configure, diff.c, sdiff.c:
3188 * diff.c: Regularize option names.
3191 * configure, diff.c, diff.h, diff3.c, sdiff.c:
3195 * diff.c, diff.h, side.c: Calculate column widths so that tabs line up.
3201 * sdiff.c: Support many more diff options, e.g. `-', `sdiff file dir'.
3203 Clean up temporary file and kill subsidiary diff if interrupted.
3204 Ensure subsidiary diff doesn't ignore SIGPIPE.
3216 * Makefile.in, sdiff.c: introduced sdiff front end to diff.
3218 * Makefile.in, analyze.c, diff.c, diff.h, io.c, side.c: Added
3219 sdiff-style output format to diff.
3243 * diff.h, diff3.c: Rearrange ifdefs to use POSIX,
3279 * diff.h (TRUE, FALSE): Undefine these before defining.
3287 * diff.h: Include regex.h.
3297 * diff.h (files): Add EXTERN.
3301 * diff.c: +print option renamed +paginate. Remove +all-text.
3305 * Makefile (dist): New target, replacing diff.tar and
3306 diff.tar.Z, to encode version number in distribution directory
3325 * diff.c (compare_files): Don't get confused if comparing
3329 print_context_script), diff.c (main), diff.h (enum
3334 * diff.c (main): Better error messages when regexps are bad.
3336 * diff.c (compare_files): Don't assume stdin is opened.
3344 * diff.c (compare_files): Set a flag so that closes don't
3347 * diff.c (main): Don't just flush stdout, do a close. That
3352 * diff.c (usage): Use = for args of long options.
3364 * diff.c (longopts, usage): unidiff => unified.
3370 * diff.c (pr_unidiff_hunk): Remove ref to output_patch_flag.
3374 * diff.c (compare_files): For -D, compare even args are same file.
3384 * diff.c (usage): Return 2.
3388 * diff.c (longopts): Add +new-files.
3395 * diff.c (longopts): Add element for +unidiff.
3415 * diff.h (O_RDONLY): Define if not defined.
3422 * diff.c (main): Recognize the option.
3424 * diff.h (file_label): New variable.
3437 Pass -a to diff if given to diff3.
3441 No need to check validity of diff output here.
3453 (process_diff): Better error message for bad diff format.
3473 * diff.h (ROBUST_OUTPUT_STYLE): New macro.
3476 * diff.h (dup2): Don't define if XENIX.
3478 * diff.c (main): Check for write error at end.
3499 * diff.h (NDIR_IN_SYS): New macro controls location of ndir.h.
3530 * diff3.c (read_diff): Pass -- as first arg to diff.
3544 * diff.h (vfork): Don't use it on Sparc.
3558 * diff.h, util.c, diff3.c: Change 'void *' to 'VOID *', with
3586 * diff.c (usage): Mention -v.
3599 * diff.c (main): -v prints version number.
3619 * diff.h: Don't declare xcalloc. Declare some other functions.
3636 * diff.c (usage): Mention -D.
3642 * diff.c (compare_files): Don't fflush for identical files.
3648 in the next diff.
3666 * Makefile (diff.tar): Expect ln to fail on some files;
3673 * diff.c (main): Handle -D option.
3679 * diff.c (option_list): Rename arg VECTOR as OPTIONVEC.
3683 * diff.c (compare_files): Clear entire inf[i].stat.
3693 * diff.c (main): Detect -q, record in no_details_flag.
3697 * diff.c (usage): New function.
3702 * diff.c (main): Make -C imply -c.
3741 * diff.h [USG]: New compilation flags HAVE_NDIR, HAVE_DIRECT.
3748 * diff.c (compare_files): Pass those args.
3766 * util.c, normal.c, io.c, ed.c, dir.c, diff.h, diff.c, context.c,
3796 * diff.c (main): -C now takes arg to specify context length.
3827 * diff.c (compare_files): Don't open directories.
3833 * diff.h: Declare index, rindex.
3835 * diff.c (compare_files): If comparing foodir with b/f,
3838 * diff.c (compare_files): Don't print "are identical" msg for 2 dirs.
3848 * diff.c: Changed S_IFDIR to S_IFMT in masking type of file bits
3853 * diff.h: Moved sys/file.h into #else USG section (not needed or