diff options
author | peter <peter@FreeBSD.org> | 2002-09-02 05:50:28 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2002-09-02 05:50:28 +0000 |
commit | 9977823bcf0469bcd2b9a4a936f590610431dc1e (patch) | |
tree | ccb6a9c2edcbb1838738b9919d5b6b414e18328e /contrib/cvs/diff | |
parent | 079d840809a2a051b85438534384a2d309b9543f (diff) | |
parent | cf46dfb750863d760d19b9858b0a336b158275da (diff) | |
download | FreeBSD-src-9977823bcf0469bcd2b9a4a936f590610431dc1e.zip FreeBSD-src-9977823bcf0469bcd2b9a4a936f590610431dc1e.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r102840,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/cvs/diff')
-rw-r--r-- | contrib/cvs/diff/ChangeLog | 35 | ||||
-rw-r--r-- | contrib/cvs/diff/Makefile.in | 148 | ||||
-rw-r--r-- | contrib/cvs/diff/io.c | 4 | ||||
-rw-r--r-- | contrib/cvs/diff/system.h | 10 |
4 files changed, 116 insertions, 81 deletions
diff --git a/contrib/cvs/diff/ChangeLog b/contrib/cvs/diff/ChangeLog index 565bdb7..5c1dfc2 100644 --- a/contrib/cvs/diff/ChangeLog +++ b/contrib/cvs/diff/ChangeLog @@ -1,3 +1,38 @@ +2001-09-04 Derek Price <dprice@collab.net> + + * Makefile.in: Regenerated with automake 1.5. + +2001-08-09 Derek Price <dprice@collab.net> + + * system.h: Source some header files when present to eliminate warning + messages under Windows. + (Patch from "Manfred Klug" <manklu@web.de>.) + +2001-08-07 Derek Price <dprice@collab.net> + + * build_diff.com: Turn on verify to get a better trace of the DCL. + * diff3.c: Eliminate compiler warning. The VMS read rval is ssize_t + (signed). The VMS size_t appears to be unsigned. + * io.c: Eliminate compiler warning (ssize_t). + (Patch from Mike Marciniszyn <Mike.Marciniszyn@sanchez.com>.) + +2001-08-06 Derek Price <dprice@collab.net> + + * Makefile.in: Regenerated. + +2001-07-04 Derek Price <dprice@collab.net> + + * Makefile.in: Regenerated with new Automake release candidate 1.4h. + +2001-06-28 Derek Price <dprice@collab.net> + + * Makefile.in: Regenerated with new version of Automake. + +2001-05-07 Larry Jones <larry.jones@sdrc.com> + + * diff3.c (diff3_run): Put the name of the output file in the error + message instead of "could not open output file" to aid in debugging. + 2001-04-25 Derek Price <dprice@collab.net> * Makefile.in: Regenerated using AM 1.4e as of today at 18:10 -0400. diff --git a/contrib/cvs/diff/Makefile.in b/contrib/cvs/diff/Makefile.in index d9d1703..4320fc5 100644 --- a/contrib/cvs/diff/Makefile.in +++ b/contrib/cvs/diff/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4e from Makefile.am. +# Makefile.in generated automatically by automake 1.5 from Makefile.am. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -13,7 +13,6 @@ @SET_MAKE@ - SHELL = @SHELL@ srcdir = @srcdir@ @@ -34,11 +33,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ @@ -52,7 +49,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -64,25 +60,22 @@ AWK = @AWK@ CC = @CC@ CSH = @CSH@ DEPDIR = @DEPDIR@ -ETAGS = @ETAGS@ -ETAGS_INCLUDE_OPTION = @ETAGS_INCLUDE_OPTION@ +EXEEXT = @EXEEXT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@ KRB4 = @KRB4@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ PR = @PR@ PS2PDF = @PS2PDF@ RANLIB = @RANLIB@ ROFF = @ROFF@ -STRIP = @STRIP@ TEXI2DVI = @TEXI2DVI@ VERSION = @VERSION@ YACC = @YACC@ -_am_include = @_am_include@ -_am_quote = @_am_quote@ +am__include = @am__include@ +am__quote = @am__quote@ includeopt = @includeopt@ install_sh = @install_sh@ @@ -96,8 +89,6 @@ libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \ EXTRA_DIST = ChangeLog build_diff.com diagmeet.note libdiff.dsp -EXEEXT = -OBJEXT = o subdir = diff mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h @@ -111,19 +102,12 @@ am_libdiff_a_OBJECTS = diff.$(OBJEXT) diff3.$(OBJEXT) analyze.$(OBJEXT) \ normal.$(OBJEXT) ifdef.$(OBJEXT) util.$(OBJEXT) dir.$(OBJEXT) \ version.$(OBJEXT) side.$(OBJEXT) libdiff_a_OBJECTS = $(am_libdiff_a_OBJECTS) -AR = ar -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CFLAGS = @CFLAGS@ -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -DIST_SOURCES = $(libdiff_a_SOURCES) depcomp = $(SHELL) $(top_srcdir)/depcomp @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/analyze.Po $(DEPDIR)/cmpbuf.Po \ @AMDEP_TRUE@ $(DEPDIR)/context.Po $(DEPDIR)/diff.Po \ @@ -131,28 +115,32 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp @AMDEP_TRUE@ $(DEPDIR)/ifdef.Po $(DEPDIR)/io.Po \ @AMDEP_TRUE@ $(DEPDIR)/normal.Po $(DEPDIR)/side.Po \ @AMDEP_TRUE@ $(DEPDIR)/util.Po $(DEPDIR)/version.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(libdiff_a_SOURCES) DIST_COMMON = ChangeLog Makefile.am Makefile.in SOURCES = $(libdiff_a_SOURCES) -OBJECTS = $(am_libdiff_a_OBJECTS) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu diff/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +AR = ar + clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -libdiff.a: $(libdiff_a_OBJECTS) $(libdiff_a_DEPENDENCIES) +libdiff.a: $(libdiff_a_OBJECTS) $(libdiff_a_DEPENDENCIES) -rm -f libdiff.a $(libdiff_a_AR) libdiff.a $(libdiff_a_OBJECTS) $(libdiff_a_LIBADD) $(RANLIB) libdiff.a @@ -163,6 +151,37 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/analyze.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cmpbuf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/context.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diff.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/diff3.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ed.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ifdef.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/io.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/normal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/side.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/util.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/version.Po@am__quote@ + +distclean-depend: + -rm -rf $(DEPDIR) + +.c.o: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + +.c.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` +CCDEPMODE = @CCDEPMODE@ +uninstall-info-am: + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -179,53 +198,21 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list @CONFIG@; do \ + unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || $(ETAGS) $(ETAGS_ARGS) $$tags $$unique $(LISP) + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) GTAGS: here=`CDPATH=: && cd $(top_builddir) && pwd` \ && cd $(top_srcdir) \ - && gtags -i $$here + && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID - -@_am_include@ @_am_quote@$(DEPDIR)/analyze.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/cmpbuf.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/context.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/diff.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/diff3.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/dir.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/ed.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/ifdef.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/io.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/normal.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/side.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/util.Po@_am_quote@ -@_am_include@ @_am_quote@$(DEPDIR)/version.Po@_am_quote@ - -distclean-depend: - -rm -rf $(DEPDIR) - -CCDEPMODE = @CCDEPMODE@ - -.c.o: - source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< - -.c.obj: - source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ - $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c -o $@ `cygpath -w $<` - + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -234,7 +221,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ if test -d $$d/$$file; then \ cp -pR $$d/$$file $(distdir) \ || exit 1; \ @@ -259,23 +250,20 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am - install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install - + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in clean: clean-am clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am @@ -285,11 +273,11 @@ distclean: distclean-am distclean-am: clean-am distclean-compile distclean-depend \ distclean-generic distclean-tags -dvi: +dvi: dvi-am dvi-am: -info: +info: info-am info-am: @@ -297,7 +285,7 @@ install-data-am: install-exec-am: -install-info: +install-info: install-info-am install-man: @@ -311,16 +299,18 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic -.PHONY: all all-am check check-am clean clean-generic \ +uninstall-am: uninstall-info-am + +.PHONY: GTAGS all all-am check check-am clean clean-generic \ clean-noinstLIBRARIES distclean distclean-compile \ distclean-depend distclean-generic distclean-tags distdir dvi \ dvi-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic tags \ - uninstall uninstall-am - + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic tags uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/contrib/cvs/diff/io.c b/contrib/cvs/diff/io.c index 730c09a..9eb2d5d 100644 --- a/contrib/cvs/diff/io.c +++ b/contrib/cvs/diff/io.c @@ -101,7 +101,7 @@ sip (current, skip_test) #if HAVE_SETMODE int oldmode = setmode (current->desc, O_BINARY); #endif - size_t n = read (current->desc, current->buffer, current->bufsize); + ssize_t n = read (current->desc, current->buffer, current->bufsize); if (n == -1) pfatal_with_name (current->name); current->buffered_chars = n; @@ -128,7 +128,7 @@ void slurp (current) struct file_data *current; { - size_t cc; + ssize_t cc; if (current->desc < 0) /* The file is nonexistent. */ diff --git a/contrib/cvs/diff/system.h b/contrib/cvs/diff/system.h index f5037ec..218d047 100644 --- a/contrib/cvs/diff/system.h +++ b/contrib/cvs/diff/system.h @@ -69,6 +69,16 @@ GNU General Public License for more details. #include <unistd.h> #endif +#ifdef HAVE_IO_H +# include <io.h> +#endif + +#ifdef HAVE_FCNTL_H +# include <fcntl.h> +#else +# include <sys/file.h> +#endif + #ifndef SEEK_SET #define SEEK_SET 0 #endif |