New release from Cyclic Software

15 files changed, 38 insertions, 73 deletions

diff --git a/gnu/usr.bin/cvs/vms/ChangeLog b/gnu/usr.bin/cvs/vms/ChangeLog
index 1b172206585..bd4239d81ff 100644
--- a/gnu/usr.bin/cvs/vms/ChangeLog
+++ b/gnu/usr.bin/cvs/vms/ChangeLog
@@ -1,3 +1,31 @@
+Thu Jan  2 13:30:56 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* dir.h, filesubr.c, filutils.c, filutils.h, misc.c, misc.h,
+	ndir.c, pipe.c, pipe.h, waitpid.c: Remove "675" paragraph;
+	see ../ChangeLog for rationale.
+
+Wed Jan  1 22:50:44 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* options.h: Reword comment for TMPDIR_DFLT to make it clear that
+	this isn't specific to the pserver server.
+
+Tue Nov 19 17:13:55 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* ndir.c (opendir): Change strip_path to strip_trailing_slashes
+	per corresponding change to src.
+	* stat.c (wrapped_stat): Likewise.
+
+Sat Oct 12 19:36:42 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* vms.h: Don't declare/define mode_t and rmdir; they conflict with
+	declarations in system include files on VAX/VMS 6.2.
+	* pwd.h: #include sys/types.h instead of trying to define uid_t,
+	gid_t and pid_t ourselves.
+
+Tue Oct  8 12:37:45 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* options.h: Remove; no longer used.
+
 Wed Sep 25 15:09:53 1996  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* options.h: Define TMPDIR_DFLT to sys$scratch not sys$login.
diff --git a/gnu/usr.bin/cvs/vms/dir.h b/gnu/usr.bin/cvs/vms/dir.h
index 7ea632db625..b1fdb0e2def 100644
--- a/gnu/usr.bin/cvs/vms/dir.h
+++ b/gnu/usr.bin/cvs/vms/dir.h
@@ -11,11 +11,7 @@ any later version.
 GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+GNU General Public License for more details.  */
 
 /*
  * Files-11 Ver. 2 directory structure (VMS V4.x - long names)
diff --git a/gnu/usr.bin/cvs/vms/filesubr.c b/gnu/usr.bin/cvs/vms/filesubr.c
index 99c0af163c3..1c0e6246d4e 100644
--- a/gnu/usr.bin/cvs/vms/filesubr.c
+++ b/gnu/usr.bin/cvs/vms/filesubr.c
@@ -14,11 +14,7 @@
    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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   GNU General Public License for more details.  */
 
 #include "cvs.h"
 
diff --git a/gnu/usr.bin/cvs/vms/filutils.c b/gnu/usr.bin/cvs/vms/filutils.c
index 748a677ad84..3c4947303ea 100644
--- a/gnu/usr.bin/cvs/vms/filutils.c
+++ b/gnu/usr.bin/cvs/vms/filutils.c
@@ -15,10 +15,6 @@
  * 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 GNU VMSLIB; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <string.h>
diff --git a/gnu/usr.bin/cvs/vms/filutils.h b/gnu/usr.bin/cvs/vms/filutils.h
index 6605353049f..1c484e839fa 100644
--- a/gnu/usr.bin/cvs/vms/filutils.h
+++ b/gnu/usr.bin/cvs/vms/filutils.h
@@ -15,10 +15,6 @@
  * 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 GNU VMSLIB; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 char *file_name_as_directory ();
diff --git a/gnu/usr.bin/cvs/vms/misc.c b/gnu/usr.bin/cvs/vms/misc.c
index 78bb27378f3..82e9c70c423 100644
--- a/gnu/usr.bin/cvs/vms/misc.c
+++ b/gnu/usr.bin/cvs/vms/misc.c
@@ -15,10 +15,6 @@
  * 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 GNU VMSLIB; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
diff --git a/gnu/usr.bin/cvs/vms/misc.h b/gnu/usr.bin/cvs/vms/misc.h
index 0494b16698e..35a48ccc154 100644
--- a/gnu/usr.bin/cvs/vms/misc.h
+++ b/gnu/usr.bin/cvs/vms/misc.h
@@ -15,10 +15,6 @@
  * 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 GNU VMSLIB; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 void fatal ();
diff --git a/gnu/usr.bin/cvs/vms/ndir.c b/gnu/usr.bin/cvs/vms/ndir.c
index 87fb0cb070a..a9758eae1dd 100644
--- a/gnu/usr.bin/cvs/vms/ndir.c
+++ b/gnu/usr.bin/cvs/vms/ndir.c
@@ -15,10 +15,6 @@
  * 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 GNU VMSLIB; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <varargs.h>
@@ -109,7 +105,7 @@ opendir (infilename, filepattern)
   filename = (char *) malloc(length+1);
   strcpy(filename, infilename);
 
-  strip_path(filename);
+  strip_trailing_slashes (filename);
   if(strcmp(filename, ".") == 0)
      {
      getcwd(filename, length+1, 1); /* Get a VMS filespec */
diff --git a/gnu/usr.bin/cvs/vms/options.h b/gnu/usr.bin/cvs/vms/options.h
index 92a03426ad4..264bfe146b5 100644
--- a/gnu/usr.bin/cvs/vms/options.h
+++ b/gnu/usr.bin/cvs/vms/options.h
@@ -28,20 +28,6 @@
 #endif
 
 /*
- * If, before installing this version of CVS, you were running RCS V4 AND you
- * are installing this CVS and RCS V5 and GNU diff 1.15 all at the same time,
- * you should turn on the following define.  It only exists to try to do
- * reasonable things with your existing checked out files when you upgrade to
- * RCS V5, since the keyword expansion formats have changed with RCS V5.
- * 
- * If you already have been running with RCS5, or haven't been running with CVS
- * yet at all, or are sticking with RCS V4 for now, leave the commented out.
- */
-#ifndef HAD_RCS4
-/* #define	HAD_RCS4 */
-#endif
-
-/*
  * For portability and heterogeneity reasons, CVS is shipped by default using
  * my own text-file version of the ndbm database library in the src/myndbm.c
  * file.  If you want better performance and are not concerned about
@@ -117,13 +103,10 @@
 #define	RCSBIN_DFLT	""
 #endif
 
-/*
- * The password-authenticating server creates a temporary checkout of
- * the affected files.  The variable TMPDIR_DFLT (or even better, the
- * command-line option "-T" in the line for CVS in /etc/inetd.conf)
- * can be used to specify the used directory.  This directory will
- * also be used for other temporary files.
- */
+/* Directory used for storing temporary files, if not overridden by
+   environment variables or the -T global option.  There should be little
+   need to change this (-T is a better mechanism if you need to use a
+   different directory for temporary files).  */
 #ifndef TMPDIR_DFLT
 #define	TMPDIR_DFLT	"sys$scratch"
 #endif
diff --git a/gnu/usr.bin/cvs/vms/pipe.c b/gnu/usr.bin/cvs/vms/pipe.c
index d6078df8e0e..eae384791bb 100644
--- a/gnu/usr.bin/cvs/vms/pipe.c
+++ b/gnu/usr.bin/cvs/vms/pipe.c
@@ -15,10 +15,6 @@
  * 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 GNU VMSLIB; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 /*
diff --git a/gnu/usr.bin/cvs/vms/pipe.h b/gnu/usr.bin/cvs/vms/pipe.h
index 6a88c1d716d..3b6b8f27218 100644
--- a/gnu/usr.bin/cvs/vms/pipe.h
+++ b/gnu/usr.bin/cvs/vms/pipe.h
@@ -15,10 +15,6 @@
  * 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 GNU VMSLIB; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/cvs/vms/pwd.h b/gnu/usr.bin/cvs/vms/pwd.h
index da0ed334a4c..3ca5dbce872 100644
--- a/gnu/usr.bin/cvs/vms/pwd.h
+++ b/gnu/usr.bin/cvs/vms/pwd.h
@@ -1,9 +1,7 @@
 #ifndef _PWD_H
 #define _PWD_H
 
-#define uid_t unsigned int
-#define gid_t unsigned int
-#define pid_t int
+#include <sys/types.h>
 
 struct passwd {
    char  *pw_name;
diff --git a/gnu/usr.bin/cvs/vms/stat.c b/gnu/usr.bin/cvs/vms/stat.c
index 336247fb73f..af3b5acc3af 100644
--- a/gnu/usr.bin/cvs/vms/stat.c
+++ b/gnu/usr.bin/cvs/vms/stat.c
@@ -10,7 +10,7 @@ struct stat *buffer;
   int rs;
 
   strcpy(statpath, path);
-  strip_path(statpath);
+  strip_trailing_slashes (statpath);
   if(strcmp(statpath, ".") == 0)
      getwd(statpath);
 
diff --git a/gnu/usr.bin/cvs/vms/vms.h b/gnu/usr.bin/cvs/vms/vms.h
index 7483c4748a6..9cd0b509eb7 100644
--- a/gnu/usr.bin/cvs/vms/vms.h
+++ b/gnu/usr.bin/cvs/vms/vms.h
@@ -1,7 +1,5 @@
 /* Determined from CC RTL function prototypes in online documentation */
 
-#define mode_t unsigned int
-     
 #define fork(x) vfork(x)
 
 #include <sys/types.h>
@@ -24,8 +22,6 @@ extern int fnmatch(char *pattern, char *string, int options);
 int unlink(char *path);
 int link(char *from, char *to);
 
-int rmdir(char *path);
-
 #define stat(a, b) wrapped_stat(a, b)
 
 #undef POSIX
diff --git a/gnu/usr.bin/cvs/vms/waitpid.c b/gnu/usr.bin/cvs/vms/waitpid.c
index 95d27b3eb31..36f20d52553 100644
--- a/gnu/usr.bin/cvs/vms/waitpid.c
+++ b/gnu/usr.bin/cvs/vms/waitpid.c
@@ -11,11 +11,7 @@ any later version.
 GNU DIFF 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 GNU DIFF; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+GNU General Public License for more details.  */
 
 #include "vms.h"