diff options
author | peter <peter@FreeBSD.org> | 2004-04-15 01:01:56 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2004-04-15 01:01:56 +0000 |
commit | 6045cae71a438a752980a395f03717a13cc22179 (patch) | |
tree | fd220ac1ddaebaa4a730f86d6f727fb639279056 /contrib/cvs/lib | |
parent | 0de1aa939e0bb1831fe5ba20e2afa2fe6d7426ab (diff) | |
download | FreeBSD-src-6045cae71a438a752980a395f03717a13cc22179.zip FreeBSD-src-6045cae71a438a752980a395f03717a13cc22179.tar.gz |
Import cvs-1.11.15
Diffstat (limited to 'contrib/cvs/lib')
-rw-r--r-- | contrib/cvs/lib/ChangeLog | 111 | ||||
-rw-r--r-- | contrib/cvs/lib/Makefile.am | 9 | ||||
-rw-r--r-- | contrib/cvs/lib/Makefile.in | 240 | ||||
-rw-r--r-- | contrib/cvs/lib/fncase.c | 50 | ||||
-rw-r--r-- | contrib/cvs/lib/getdate.y | 18 | ||||
-rw-r--r-- | contrib/cvs/lib/getpass.c | 106 | ||||
-rw-r--r-- | contrib/cvs/lib/mkdir.c | 2 | ||||
-rw-r--r-- | contrib/cvs/lib/regex.c | 2 | ||||
-rw-r--r-- | contrib/cvs/lib/system.h | 101 | ||||
-rw-r--r-- | contrib/cvs/lib/wait.h | 3 |
10 files changed, 528 insertions, 114 deletions
diff --git a/contrib/cvs/lib/ChangeLog b/contrib/cvs/lib/ChangeLog index 8cf3e6f..ae64487 100644 --- a/contrib/cvs/lib/ChangeLog +++ b/contrib/cvs/lib/ChangeLog @@ -1,3 +1,114 @@ +2004-04-07 Derek Price <derek@ximbiot.com> + + * regex.c: Revise "FREE_VAR" macro to eliminate C4090/C4022 warnings + in Windows build with Visual C++ 6.0 compiler. + (Original patch from Conrad T. Pino <Conrad@Pino.com>.) + +2004-04-04 Derek Price <derek@ximbiot.com> + + * system.h: Correct comment. + +2004-04-04 Derek Price <derek@ximbiot.com> + + * system.h: Restore complete path folding for Cygwin under Windows. + Add ISABSOLUTE macro for determining whether a path is absolute to + handle X:\ style paths under Windows (& Cygwin). + +2004-03-25 Derek Price <derek@ximbiot.com> + + * system.h: No longer fold back slashes in paths into slashes. + +2004-03-20 Derek Price <derek@ximbiot.com> + + * mkdir.c (mkdir): Declare string args const. + +2004-03-19 Derek Price <derek@ximbiot.com> + + * .cvsignore: Add fnmatch.h for Windows and other platforms which build + it. + +2003-12-09 Derek Price <derek@ximbiot.com> + + * system.h: Correct spelling in comment. + +2003-12-03 Derek Price <derek@ximbiot.com> + + * fncase.c (OSX_filename_classes): New array. + (fncmp): Use FOLD_FN_CASE rather relying on the fact that it will be + #defined to use WNT_filename_classes. + * system.h: Define FOLD_FN_CASE, fncmp, and fnfold for all case + insensitive filesystems. Share some code between the new generic case + insensitive section and the old WOE32 section. + +2003-10-02 Derek Price <derek@ximbiot.com> + + * getpass.c: Back out my last getpass.c update since the new GNULIB + version introduced some dependencies which I do not want to introduce + on stable. + +2003-10-01 Derek Price <derek@ximbiot.com> + + * getpass.c: Update to new version from GNULIB with Larry's fix + incorporated. + +2003-09-30 Larry Jones <lawrence.jones@eds.com> + + * getpass.c: Fix bug that caused password to be echoed on many + systems (input may not be followed by output on the same stream + without an intervening call to a file positioning function). + (Reported by David Everly <david.everly@mci.com>.) + +2003-07-29 Derek Price <derek@ximbiot.com> + + * getpass.c: New file, almost identical to GNULIB's currect version. + * Makefile.am (libcvs_a_SOURCES): Add getpass.c. + * Makefile.in: Regenerated. + +2003-06-09 Derek Price <derek@ximbiot.com> + + * system.h: Reference the WIN32 macro only in order to define WOE32, + in accordance with the GNU convention to avoid implying that we + consider the Microsoft Windows Operating Environment any sort of "win". + +2003-05-21 Derek Price <derek@ximbiot.com> + + * Makefile.in: Regenerate with Automake version 1.7.5. + +2003-05-09 Derek Price <derek@ximbiot.com> + + * system.h: Define S_ISSOCK on SCO OpenServer. + +2003-04-10 Larry Jones <lawrence.jones@eds.com> + + * Makefile.in: Regenerated. + +2003-04-03 Derek Price <derek@ximbiot.com> + + * Makefile.am (distclean-local): New target to remove fnmatch.h when + necessary. This should be handled by Automake, but until then... + (Resolves issue #100 + <http://ccvs.cvshome.org/issues/show_bug.cgi?id=100> from + Serguei E. Leontiev <Serge3lse@cvshome.org>.) + + * Makefile.in: Regenerated. + +2003-03-24 Derek Price <derek@ximbiot.com> + + * Makefile.am: Update copyright notice. + + * Makefile.in: Regenerated. + +2003-02-25 Derek Price <derek@ximbiot.com> + + * Makefile.in: Regenerated. + +2003-01-23 Larry Jones <lawrence.jones@eds.com> + + * getdate.y: Add RCS/CVS timestamp format (Y.mm.dd.hh.mm.ss). + * getdate.c: Regenerated. + + * wait.h (WCOREDUMP): New macro. + 2002-12-27 Derek Price <derek@ximbiot.com> * getdate.c: Regenerated with Bison 1.35. diff --git a/contrib/cvs/lib/Makefile.am b/contrib/cvs/lib/Makefile.am index 4e4dae9..9409b9a 100644 --- a/contrib/cvs/lib/Makefile.am +++ b/contrib/cvs/lib/Makefile.am @@ -1,6 +1,8 @@ ## Process this file with automake to produce Makefile.in # Makefile for library files used by GNU CVS. -# Copyright (C) 1986, 1988-1994, 2000 Free Software Foundation, Inc. +# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,6 +46,7 @@ libcvs_a_SOURCES = \ getline.c \ getopt.c \ getopt1.c \ + getpass.c \ md5.c \ regex.c \ savecwd.c \ @@ -84,6 +87,10 @@ EXTRA_DIST = \ build_lib.com \ xgssapi.h +# Until Automake gets its act together +distclean-local: + rm -f fnmatch.h + # for backwards compatibility with the old makefiles realclean: maintainer-clean .PHONY: realclean diff --git a/contrib/cvs/lib/Makefile.in b/contrib/cvs/lib/Makefile.in index adc4d39..a8ff862 100644 --- a/contrib/cvs/lib/Makefile.in +++ b/contrib/cvs/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,9 @@ @SET_MAKE@ # Makefile for library files used by GNU CVS. -# Copyright (C) 1986, 1988-1994, 2000 Free Software Foundation, Inc. +# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, +# 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,79 +28,117 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CSH = @CSH@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ EDITOR = @EDITOR@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KRB4 = @KRB4@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@ +MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@ +MKTEMP = @MKTEMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PR = @PR@ PS2PDF = @PS2PDF@ RANLIB = @RANLIB@ ROFF = @ROFF@ +SENDMAIL = @SENDMAIL@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ TEXI2DVI = @TEXI2DVI@ VERSION = @VERSION@ YACC = @YACC@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +ac_prefix_program = @ac_prefix_program@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build_alias = @build_alias@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +includedir = @includedir@ includeopt = @includeopt@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ # For now we need to include $(top_srcdir)/src because some systems # (at least 'AIX rioscpu2 3 4 000030498200', @@ -132,6 +172,7 @@ libcvs_a_SOURCES = \ getline.c \ getopt.c \ getopt1.c \ + getpass.c \ md5.c \ regex.c \ savecwd.c \ @@ -159,6 +200,7 @@ EXTRA_DIST = \ xgssapi.h subdir = lib +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -168,16 +210,12 @@ libcvs_a_AR = $(AR) cru libcvs_a_DEPENDENCIES = @LIBOBJS@ am_libcvs_a_OBJECTS = argmatch.$(OBJEXT) getdate.$(OBJEXT) \ getline.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) \ - md5.$(OBJEXT) regex.$(OBJEXT) savecwd.$(OBJEXT) \ - sighandle.$(OBJEXT) stripslash.$(OBJEXT) xgetwd.$(OBJEXT) \ - yesno.$(OBJEXT) + getpass.$(OBJEXT) md5.$(OBJEXT) regex.$(OBJEXT) \ + savecwd.$(OBJEXT) sighandle.$(OBJEXT) stripslash.$(OBJEXT) \ + xgetwd.$(OBJEXT) yesno.$(OBJEXT) libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS) -DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dup2.Po $(DEPDIR)/fncase.Po \ @@ -189,31 +227,31 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ $(DEPDIR)/valloc.Po $(DEPDIR)/waitpid.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/argmatch.Po ./$(DEPDIR)/getdate.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/getline.Po ./$(DEPDIR)/getopt.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/md5.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/regex.Po ./$(DEPDIR)/savecwd.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/sighandle.Po ./$(DEPDIR)/stripslash.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/xgetwd.Po ./$(DEPDIR)/yesno.Po +@AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/getpass.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/regex.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/savecwd.Po ./$(DEPDIR)/sighandle.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/stripslash.Po ./$(DEPDIR)/xgetwd.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/yesno.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@ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) DIST_SOURCES = $(libcvs_a_SOURCES) -DIST_COMMON = ChangeLog Makefile.am Makefile.in dup2.c fncase.c \ - fnmatch.c fnmatch.h.in ftruncate.c getdate.c gethostname.c \ - memmove.c mkdir.c rename.c strerror.c strstr.c strtoul.c \ - valloc.c waitpid.c +DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am dup2.c \ + fncase.c fnmatch.c fnmatch.h.in ftruncate.c getdate.c \ + gethostname.c memmove.c mkdir.c rename.c strerror.c strstr.c \ + strtoul.c valloc.c waitpid.c SOURCES = $(libcvs_a_SOURCES) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj .y -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) AR = ar @@ -250,6 +288,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpass.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savecwd.Po@am__quote@ @@ -258,26 +297,30 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgetwd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yesno.Po@am__quote@ -distclean-depend: - -rm -rf $(DEPDIR) ./$(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)/'`$< +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(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@ +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +@am__fastdepCC_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .y.c: $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< - sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@ - rm -f y.tab.c if test -f y.tab.h; then \ to=`echo "$*_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ @@ -293,11 +336,16 @@ CCDEPMODE = @CCDEPMODE@ if test -f y.output; then \ mv y.output $*.output; \ fi + sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@ + rm -f y.tab.c uninstall-info-am: ETAGS = etags ETAGSFLAGS = +CTAGS = ctags +CTAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -323,20 +371,41 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + 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 "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -361,7 +430,6 @@ check: check-am all-am: Makefile $(LIBRARIES) installdirs: - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -373,7 +441,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -381,20 +449,21 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "getdate.c" || rm -f getdate.c + -rm -f getdate.c clean: clean-am clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-tags + -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-local distclean-tags dvi: dvi-am @@ -415,26 +484,39 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + 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 \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-local 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-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 + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-info-am + +# Until Automake gets its act together +distclean-local: + rm -f fnmatch.h # for backwards compatibility with the old makefiles realclean: maintainer-clean diff --git a/contrib/cvs/lib/fncase.c b/contrib/cvs/lib/fncase.c index 56e7f51..c8fb25f 100644 --- a/contrib/cvs/lib/fncase.c +++ b/contrib/cvs/lib/fncase.c @@ -50,6 +50,8 @@ main () } #endif +/* Under Windows NT, filenames are case-insensitive but case-preserving, + and both \ and / are path element separators. */ unsigned char WNT_filename_classes[] = { @@ -87,18 +89,56 @@ WNT_filename_classes[] = 0xf8,0xf9,0xfa,0xfb, 0xfc,0xfd,0xfe,0xff, }; +/* Same as WNT_filename_classes, but do not fold `\' into `/'. */ +unsigned char +OSX_filename_classes[] = +{ + 0x00,0x01,0x02,0x03, 0x04,0x05,0x06,0x07, + 0x08,0x09,0x0a,0x0b, 0x0c,0x0d,0x0e,0x0f, + 0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, + 0x18,0x19,0x1a,0x1b, 0x1c,0x1d,0x1e,0x1f, + 0x20,0x21,0x22,0x23, 0x24,0x25,0x26,0x27, + 0x28,0x29,0x2a,0x2b, 0x2c,0x2d,0x2e,0x2f, + 0x30,0x31,0x32,0x33, 0x34,0x35,0x36,0x37, + 0x38,0x39,0x3a,0x3b, 0x3c,0x3d,0x3e,0x3f, + 0x40,0x61,0x62,0x63, 0x64,0x65,0x66,0x67, + 0x68,0x69,0x6a,0x6b, 0x6c,0x6d,0x6e,0x6f, + 0x70,0x71,0x72,0x73, 0x74,0x75,0x76,0x77, + 0x78,0x79,0x7a,0x5b, 0x2f,0x5d,0x5e,0x5f, + 0x60,0x61,0x62,0x63, 0x64,0x65,0x66,0x67, + 0x68,0x69,0x6a,0x6b, 0x6c,0x6d,0x6e,0x6f, + 0x70,0x71,0x72,0x73, 0x74,0x75,0x76,0x77, + 0x78,0x79,0x7a,0x7b, 0x7c,0x7d,0x7e,0x7f, + 0x80,0x81,0x82,0x83, 0x84,0x85,0x86,0x87, + 0x88,0x89,0x8a,0x8b, 0x8c,0x8d,0x8e,0x8f, + 0x90,0x91,0x92,0x93, 0x94,0x95,0x96,0x97, + 0x98,0x99,0x9a,0x9b, 0x9c,0x9d,0x9e,0x9f, + 0xa0,0xa1,0xa2,0xa3, 0xa4,0xa5,0xa6,0xa7, + 0xa8,0xa9,0xaa,0xab, 0xac,0xad,0xae,0xaf, + 0xb0,0xb1,0xb2,0xb3, 0xb4,0xb5,0xb6,0xb7, + 0xb8,0xb9,0xba,0xbb, 0xbc,0xbd,0xbe,0xbf, + 0xc0,0xc1,0xc2,0xc3, 0xc4,0xc5,0xc6,0xc7, + 0xc8,0xc9,0xca,0xcb, 0xcc,0xcd,0xce,0xcf, + 0xd0,0xd1,0xd2,0xd3, 0xd4,0xd5,0xd6,0xd7, + 0xd8,0xd9,0xda,0xdb, 0xdc,0xdd,0xde,0xdf, + 0xe0,0xe1,0xe2,0xe3, 0xe4,0xe5,0xe6,0xe7, + 0xe8,0xe9,0xea,0xeb, 0xec,0xed,0xee,0xef, + 0xf0,0xf1,0xf2,0xf3, 0xf4,0xf5,0xf6,0xf7, + 0xf8,0xf9,0xfa,0xfb, 0xfc,0xfd,0xfe,0xff, +}; + /* Like strcmp, but with the appropriate tweaks for file names. Under Windows NT, filenames are case-insensitive but case-preserving, - and both \ and / are path element separators. */ + and both \ and / are path element separators. Under Mac OS X, filenames + are case-insensitive but case-preserving. */ int fncmp (const char *n1, const char *n2) { while (*n1 && *n2 - && (WNT_filename_classes[(unsigned char) *n1] - == WNT_filename_classes[(unsigned char) *n2])) + && (FOLD_FN_CHAR(*n1) + == FOLD_FN_CHAR(*n2))) n1++, n2++; - return (WNT_filename_classes[(unsigned char) *n1] - - WNT_filename_classes[(unsigned char) *n2]); + return (FOLD_FN_CHAR(*n1) - FOLD_FN_CHAR(*n2)); } /* Fold characters in FILENAME to their canonical forms. diff --git a/contrib/cvs/lib/getdate.y b/contrib/cvs/lib/getdate.y index c321305..0e128d7 100644 --- a/contrib/cvs/lib/getdate.y +++ b/contrib/cvs/lib/getdate.y @@ -175,9 +175,27 @@ item : time { | rel { yyHaveRel++; } + | cvsstamp { + yyHaveTime++; + yyHaveDate++; + yyHaveZone++; + } | number ; +cvsstamp: tUNUMBER '.' tUNUMBER '.' tUNUMBER '.' tUNUMBER '.' tUNUMBER '.' tUNUMBER { + yyYear = $1; + if (yyYear < 100) yyYear += 1900; + yyMonth = $3; + yyDay = $5; + yyHour = $7; + yyMinutes = $9; + yySeconds = $11; + yyDSTmode = DSToff; + yyTimezone = 0; + } + ; + time : tUNUMBER tMERIDIAN { yyHour = $1; yyMinutes = 0; diff --git a/contrib/cvs/lib/getpass.c b/contrib/cvs/lib/getpass.c new file mode 100644 index 0000000..e4d4fe9 --- /dev/null +++ b/contrib/cvs/lib/getpass.c @@ -0,0 +1,106 @@ +/* Copyright (C) 1992,93,94,95,96,97,98,99,2000, 2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#include <stdio.h> +#ifndef SEEK_CUR +#define SEEK_CUR 1 +#endif +#include <termios.h> +#include <unistd.h> +#include "getline.h" + +/* It is desirable to use this bit on systems that have it. + The only bit of terminal state we want to twiddle is echoing, which is + done in software; there is no need to change the state of the terminal + hardware. */ + +#ifndef TCSASOFT +# define TCSASOFT 0 +#endif + +char * +getpass (const char *prompt) +{ + FILE *in, *out; + struct termios s, t; + int tty_changed; + static char *buf; + static size_t bufsize; + ssize_t nread; + + /* Try to write to and read from the terminal if we can. + If we can't open the terminal, use stderr and stdin. */ + + in = fopen ("/dev/tty", "w+"); + if (in == NULL) + { + in = stdin; + out = stderr; + } + else + out = in; + + /* Turn echoing off if it is on now. */ + + if (tcgetattr (fileno (in), &t) == 0) + { + /* Save the old one. */ + s = t; + /* Tricky, tricky. */ + t.c_lflag &= ~(ECHO|ISIG); + tty_changed = (tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0); + } + else + tty_changed = 0; + + /* Write the prompt. */ + fputs (prompt, out); + fflush (out); + + /* Read the password. */ + nread = getline (&buf, &bufsize, in); + if (buf != NULL) + { + if (nread < 0) + buf[0] = '\0'; + else if (buf[nread - 1] == '\n') + { + /* Remove the newline. */ + buf[nread - 1] = '\0'; + if (tty_changed) + { + /* Write the newline that was not echoed. */ + if (out == in) fseek (out, 0, SEEK_CUR); + putc ('\n', out); + } + } + } + + /* Restore the original setting. */ + if (tty_changed) + (void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &s); + + if (in != stdin) + /* We opened the terminal; now close it. */ + fclose (in); + + return buf; +} diff --git a/contrib/cvs/lib/mkdir.c b/contrib/cvs/lib/mkdir.c index babe4ac..47ff4ea 100644 --- a/contrib/cvs/lib/mkdir.c +++ b/contrib/cvs/lib/mkdir.c @@ -37,7 +37,7 @@ extern int errno; int mkdir (dpath, dmode) - char *dpath; + const char *dpath; int dmode; { int cpid, status; diff --git a/contrib/cvs/lib/regex.c b/contrib/cvs/lib/regex.c index b02a0c7..dd56bdb 100644 --- a/contrib/cvs/lib/regex.c +++ b/contrib/cvs/lib/regex.c @@ -4001,7 +4001,7 @@ static boolean alt_match_null_string_p (), /* Free everything we malloc. */ #ifdef MATCH_MAY_ALLOCATE -#define FREE_VAR(var) if (var) { REGEX_FREE (var); var = NULL; } else +#define FREE_VAR(var) if (var) { (void)REGEX_FREE ((void *)var); var = NULL; } else #define FREE_VARIABLES() \ do { \ REGEX_FREE_STACK (fail_stack.stack); \ diff --git a/contrib/cvs/lib/system.h b/contrib/cvs/lib/system.h index e55d3c6..4b25d31 100644 --- a/contrib/cvs/lib/system.h +++ b/contrib/cvs/lib/system.h @@ -84,13 +84,18 @@ # endif #endif -#if !defined(S_ISSOCK) && defined(S_IFSOCK) -# if defined(S_IFMT) -# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) -# else -# define S_ISSOCK(m) ((m) & S_IFSOCK) -# endif -#endif +#ifndef S_ISSOCK +# if defined( S_IFSOCK ) +# ifdef S_IFMT +# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) +# else +# define S_ISSOCK(m) ((m) & S_IFSOCK) +# endif /* S_IFMT */ +# elif defined( S_ISNAM ) + /* SCO OpenServer 5.0.6a */ +# define S_ISSOCK S_ISNAM +# endif /* !S_IFSOCK && S_ISNAM */ +#endif /* !S_ISSOCK */ #if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ # if defined(S_IFMT) @@ -452,30 +457,65 @@ extern int errno; #define CVS_FNMATCH fnmatch #endif -#if defined (__CYGWIN32__) || defined (WIN32) +#ifdef WIN32 +/* + * According to GNU conventions, we should avoid referencing any macro + * containing "WIN" as a reference to Microsoft Windows, as we would like to + * avoid any implication that we consider Microsoft Windows any sort of "win". + * + * FIXME: As of 2003-06-09, folks on the GNULIB project were discussing + * defining a configure macro to define WOE32 appropriately. If they ever do + * write such a beast, we should use it, though in most cases it would be + * preferable to avoid referencing any OS or compiler anyhow, per Autoconf + * convention, and reference only tested features of the system. + */ +# define WOE32 1 +#endif /* WIN32 */ -/* Under Windows NT, filenames are case-insensitive, and both / and \ - are path component separators. */ -#define FOLD_FN_CHAR(c) (WNT_filename_classes[(unsigned char) (c)]) -extern unsigned char WNT_filename_classes[]; -#define FILENAMES_CASE_INSENSITIVE 1 +#ifdef WOE32 + /* Under Windows NT, filenames are case-insensitive. */ +# define FILENAMES_CASE_INSENSITIVE 1 +#endif /* WOE32 */ + -/* Is the character C a path name separator? Under - Windows NT, you can use either / or \. */ -#define ISDIRSEP(c) (FOLD_FN_CHAR(c) == '/') -/* Like strcmp, but with the appropriate tweaks for file names. - Under Windows NT, filenames are case-insensitive but case-preserving, - and both \ and / are path element separators. */ +#ifdef FILENAMES_CASE_INSENSITIVE + +# if defined (__CYGWIN32__) || defined (WOE32) + /* Under Windows NT, filenames are case-insensitive, and both / and \ + are path component separators. */ +# define FOLD_FN_CHAR(c) (WNT_filename_classes[(unsigned char) (c)]) +extern unsigned char WNT_filename_classes[]; + /* Is the character C a path name separator? Under + Windows NT, you can use either / or \. */ +# define ISDIRSEP(c) (FOLD_FN_CHAR(c) == '/') +# define ISABSOLUTE(s) (ISDIRSEP(s[0]) || FOLD_FN_CHAR(s[0]) >= 'a' && FOLD_FN_CHAR(s[0]) <= 'z' && s[1] == ':' && ISDIRSEP(s[2])) +# else /* ! WOE32 */ + /* As far as I know, both Cygwin and Macintosh OS X can make it here, + * but since the OS X fold just folds a-z into A-Z or visa-versa, I'm just + * using it for Cygwin too. The var name below could probably use a + * rename. + * + * Under Mac OS X & Cygwin, filenames are case-insensitive. + */ +# define FOLD_FN_CHAR(c) (OSX_filename_classes[(unsigned char) (c)]) +extern unsigned char OSX_filename_classes[]; +# endif /* __CYGWIN32__ || WOE32 */ + +/* The following need to be declared for all case insensitive filesystems. + * When not FOLD_FN_CHAR is not #defined, a default definition for these + * functions is provided later in this header file. */ + +/* Like strcmp, but with the appropriate tweaks for file names. */ extern int fncmp (const char *n1, const char *n2); -/* Fold characters in FILENAME to their canonical forms. - If FOLD_FN_CHAR is not #defined, the system provides a default - definition for this. */ +/* Fold characters in FILENAME to their canonical forms. */ extern void fnfold (char *FILENAME); -#endif /* defined (__CYGWIN32__) || defined (WIN32) */ +#endif /* FILENAMES_CASE_INSENSITIVE */ + + /* Some file systems are case-insensitive. If FOLD_FN_CHAR is #defined, it maps the character C onto its "canonical" form. In a @@ -483,15 +523,22 @@ extern void fnfold (char *FILENAME); to lower case. Under Windows NT, / and \ are both path component separators, so FOLD_FN_CHAR would map them both to /. */ #ifndef FOLD_FN_CHAR -#define FOLD_FN_CHAR(c) (c) -#define fnfold(filename) (filename) -#define fncmp strcmp +# define FOLD_FN_CHAR(c) (c) +# define fnfold(filename) (filename) +# define fncmp strcmp #endif /* Different file systems have different path component separators. For the VMS port we might need to abstract further back than this. */ #ifndef ISDIRSEP -#define ISDIRSEP(c) ((c) == '/') +# define ISDIRSEP(c) ((c) == '/') +#endif + +/* Different file systems can have different naming patterns which designate + * a path as absolute + */ +#ifndef ISABSOLUTE +# define ISABSOLUTE(s) ISDIRSEP(s[0]) #endif diff --git a/contrib/cvs/lib/wait.h b/contrib/cvs/lib/wait.h index 60ed47a..81df938 100644 --- a/contrib/cvs/lib/wait.h +++ b/contrib/cvs/lib/wait.h @@ -27,6 +27,9 @@ #ifndef WIFEXITED #define WIFEXITED(w) (((w) & 0xff) == 0) #endif +#ifndef WCOREDUMP /* not POSIX, but common and useful */ +#define WCOREDUMP(w) (((w) & 0x80) != 0) +#endif #ifndef WSTOPSIG #define WSTOPSIG(w) (((w) >> 8) & 0xff) |