retain -Z options to rcs commands even though they do not work (rcs

commands spawn children which do not inherit the -Z option...) but also
look in the RCSLOCALID environment variable. cvs sets this to "OpenBSD",
as read from the options file.

3 files changed, 2 insertions, 8 deletions

diff --git a/gnu/usr.bin/cvs/src/cvs.h b/gnu/usr.bin/cvs/src/cvs.h
index ac053441ec6..76b134967ad 100644
--- a/gnu/usr.bin/cvs/src/cvs.h
+++ b/gnu/usr.bin/cvs/src/cvs.h
@@ -416,7 +416,6 @@ extern int trace;		/* Show all commands */
 extern int noexec;		/* Don't modify disk anywhere */
 extern int readonlyfs;		/* fail on all write locks; succeed all read locks */
 extern int logoff;		/* Don't write history entry */
-extern char *RCS_citag;		/* special -Z tag for RCS */
 
 extern char hostname[];
 
diff --git a/gnu/usr.bin/cvs/src/main.c b/gnu/usr.bin/cvs/src/main.c
index 5808ca375cc..7265fc271ae 100644
--- a/gnu/usr.bin/cvs/src/main.c
+++ b/gnu/usr.bin/cvs/src/main.c
@@ -870,7 +870,8 @@ parseopts()
 		*p = '\0';
 
 	    if (!strncmp(buf, "tag=", 4)) {
-		RCS_citag = strdup(buf+4);
+		char *RCS_citag = strdup(buf+4);
+		setenv("RCSLOCALID", RCS_citag, 1);
 	    } else if (!strncmp(buf, "umask=", 6)) {
 		int mode;
 
diff --git a/gnu/usr.bin/cvs/src/rcscmds.c b/gnu/usr.bin/cvs/src/rcscmds.c
index eabd1aec310..66aea57447a 100644
--- a/gnu/usr.bin/cvs/src/rcscmds.c
+++ b/gnu/usr.bin/cvs/src/rcscmds.c
@@ -17,8 +17,6 @@
    -1 for error (and errno is set to indicate the error), positive for
    error (and an error message has been printed), or zero for success.  */
 
-char *RCS_citag;
-
 int
 RCS_settag(path, tag, rev)
     const char *path;
@@ -150,8 +148,6 @@ RCS_checkout (rcsfile, workfile, tag, options, sout, flags, noerr)
 	run_arg ("-l");
     if (flags & RCS_FLAGS_FORCE)
 	run_arg ("-f");
-    if (RCS_citag)
-	run_arg (RCS_citag);
     run_arg (rcsfile);
     if (workfile != NULL && workfile[0] != '\0')
 	run_arg (workfile);
@@ -184,8 +180,6 @@ RCS_checkin (rcsfile, workfile, message, rev, flags, noerr)
 	run_arg ("-q");
     if (flags & RCS_FLAGS_MODTIME)
 	run_arg ("-d");
-    if (RCS_citag)
-	run_arg (RCS_citag);
     run_args ("-m%s", make_message_rcslegal (message));
     if (workfile != NULL)
 	run_arg (workfile);