Latest version from Cyclic

5 files changed, 38 insertions, 30 deletions

diff --git a/gnu/usr.bin/cvs/windows-NT/ChangeLog b/gnu/usr.bin/cvs/windows-NT/ChangeLog
index 4da9b84aee1..1de19e3bed2 100644
--- a/gnu/usr.bin/cvs/windows-NT/ChangeLog
+++ b/gnu/usr.bin/cvs/windows-NT/ChangeLog
@@ -1,3 +1,7 @@
+1998-04-09  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* filesubr.c (link_file): Remove; no longer used.
+
 Tue Feb 17 02:31:41 1998  Noel Cragg  <noel@swish.red-bean.com>
 
 	* filesubr.c (last_component): return the top-level directory when
diff --git a/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog b/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog
index 9673b144931..a4f44c3acd8 100644
--- a/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog
+++ b/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog
@@ -1,3 +1,11 @@
+1998-03-22  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* pubscc.h: Describe how SccGetCommandOptions works.
+
+1998-03-10  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* README.txt: Update and clarify various minor points.
+
 Tue Jan 27 12:54:05 1998  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* README.txt: Update bug-cvs address to gnu.org.
diff --git a/gnu/usr.bin/cvs/windows-NT/SCC/README.txt b/gnu/usr.bin/cvs/windows-NT/SCC/README.txt
index 816ede95e47..3d89711e22a 100644
--- a/gnu/usr.bin/cvs/windows-NT/SCC/README.txt
+++ b/gnu/usr.bin/cvs/windows-NT/SCC/README.txt
@@ -1,10 +1,11 @@
 This is an experimental attempt to interface to the SCC API.
 
 Note that this code doesn't (yet) do anything useful; this file
-is currently for people who want to help hack on our SCC interface,
-not people who want to use it.
+is currently for people who want to hack on the SCC interface,
+not people who want a plug-in integration between any particular pair
+of packages.
 
-To install it, build scc.dll and then add the following
+To install the test DLL, build scc.dll and then add the following
 to the registry using the registry editor:
 
 key/value                what to put there
@@ -29,7 +30,8 @@ CVS is not owned by any one company, so CVS seems like the
 most appropriate string to put there.
 
 If you do this right, then "Source Control" should appear
-under the "Tools" menu.
+under the "Tools" menu (for Visual C++ 4.x; the details of course may
+vary for other development environments).
 
 NOW WHAT?
 
@@ -88,8 +90,8 @@ although they may be at a somewhat different level and systems may
 support/use several interfaces rather than it being an either/or thing.
 
 If you know of other interfaces which should be added here I guess the
-best place to make suggestions is bug-cvs@prep.ai.mit.edu (although
-this list is not intended to be CVS-centric).
+best place to make suggestions is bug-cvs@gnu.org (although
+the following list is not intended to be particularly CVS-centric).
 
 * The CVS remote protocol is documented in doc/cvsclient.texi in the
 CVS distribution and has at least 2 implementations of the client
@@ -103,11 +105,11 @@ implements this via a module which speaks the Metrowerks API out one
 end and the OLE Automation interface out the other (the module runs on
 Windows, not Mac).
 
-* There is an API (for Java, I think) which is supported by Symantec's
-Visual Cafe 2.0, and will be supported by a service pack which will
-implement it for StarTeam 2.1 (source: usenet post by Steve Reynolds
-of StarBase, Oct 1997).
+* Symantec's Visual Cafe interface.
 
 * Metrowerks publishes and implements the CodeWarrior IDE Version
 Control System API.  I think maybe the way to get a copy of the spec
 is as part of CodeWarrior but I'm not completely clear on that.
+
+For (some) more details on these interfaces, and others, see
+    http://www.cyclic.com/cvs/dev-int.html
diff --git a/gnu/usr.bin/cvs/windows-NT/SCC/pubscc.h b/gnu/usr.bin/cvs/windows-NT/SCC/pubscc.h
index 0962abdba9a..f97d9250a19 100644
--- a/gnu/usr.bin/cvs/windows-NT/SCC/pubscc.h
+++ b/gnu/usr.bin/cvs/windows-NT/SCC/pubscc.h
@@ -441,12 +441,20 @@ extern SCC_return SccRunScc
    LONG num_files,
    LPSTR *file_names);
 
-/* Lots of things that we could do here.  Options to get/update
-   such as -r -D -k etc. just for starters.  Note that the terminology is
-   a little confusing here.  This function relates to "provider options"
-   (prov_options) which are a way for us to provide extra dialogs beyond
-   the basic ones for a particular command.  It is unrelated to "command
-   options" (SCC_cmdopt_*).  */
+/* If the user invokes version-control-system-defined behavior
+   (typically by clicking an Advanced button in a dialog, e.g. the Get
+   dialog), and the user clicks on that button, then the development
+   environment calls SccGetCommandOptions.  The version control system
+   interacts with the user and then sets *PROV_OPTIONSP to whatever it
+   wants.  The development environment doesn't do anything with it,
+   but does pass it to the various commands as prov_options.  If it
+   calls SccGetCommandOptions again, it will pass the same value (so
+   user choices from the previous "Advanced" click can serve as
+   defaults).
+
+   Note that "provider options" (prov_options) are unrelated to
+   "command options" (SCC_cmdopt_*).  */
+
 extern SCC_return SccGetCommandOptions
   (void *context_arg, HWND window,
    enum SCC_command command,
diff --git a/gnu/usr.bin/cvs/windows-NT/filesubr.c b/gnu/usr.bin/cvs/windows-NT/filesubr.c
index ef88c5d8a86..0008b112a0b 100644
--- a/gnu/usr.bin/cvs/windows-NT/filesubr.c
+++ b/gnu/usr.bin/cvs/windows-NT/filesubr.c
@@ -99,20 +99,6 @@ copy_file (from, to)
     (void) utime (to, &t);
 }
 
-/*
- * link a file, if possible.  Warning: the Windows NT version of this
- * function just copies the file, so only use this function in ways
- * that can deal with either a link or a copy.
- */
-int
-link_file (from, to)
-    const char *from;
-    const char *to;
-{
-    copy_file (from, to);
-    return 0;
-}
-
 /* FIXME-krp: these functions would benefit from caching the char * &
    stat buf.  */