summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1999-12-04 01:23:26 +0000
committerobrien <obrien@FreeBSD.org>1999-12-04 01:23:26 +0000
commit63450d9255e220eae71809916a53b0271fe91396 (patch)
treea18dd0ab81c82bd7f3a00b4010022db759e33f9c /contrib
parent6d5159c5176d72a2019f42ffe18bb9aa9c6c202b (diff)
downloadFreeBSD-src-63450d9255e220eae71809916a53b0271fe91396.zip
FreeBSD-src-63450d9255e220eae71809916a53b0271fe91396.tar.gz
Support the environtmental var "CVS_OPTIONS". Which can hold a set of
default options for cvs. These options are interpreted first and can be overwritten by explicit command line parameters. Obtained from: GNU Grep 2.3
Diffstat (limited to 'contrib')
-rw-r--r--contrib/cvs/man/cvs.118
-rw-r--r--contrib/cvs/src/main.c5
-rw-r--r--contrib/cvs/src/prepend_args.c87
-rw-r--r--contrib/cvs/src/prepend_args.h26
4 files changed, 135 insertions, 1 deletions
diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1
index 1b30468..3714528 100644
--- a/contrib/cvs/man/cvs.1
+++ b/contrib/cvs/man/cvs.1
@@ -233,7 +233,10 @@ environment variable is set.
.B \-R
Turns on read-only repository mode. This allows one to check out from a
read-only repository, such as within an anoncvs server, or from a CDROM
-repository. Using
+repository.
+Same effect as if the
+.SM CVSREADONLYFS
+environment variable is set. Using
.B \-R
can also considerably speed up checkout's over NFS.
.TP
@@ -2047,6 +2050,13 @@ will try hard to make the files in your working directory read-only.
When this is not set, the default behavior is to permit modification
of your working files.
.TP
+.SM CVSREADONLYFS
+If this is set, the
+.B \-R
+option is assumed, and
+.B cvs
+operates in read-only repository mode.
+.TP
.SM RCSBIN
Specifies the full pathname where to find
.SM RCS
@@ -2072,6 +2082,12 @@ If this variable is set then
.B cvs
will ignore all references to remote repositories in the CVS/Root file.
.TP
+.SM CVS_OPTIONS
+Specifies a set of default options for
+.B cvs.
+These options are interpreted before the startup file (\fI~/.cvsrc\fP) is read
+and can be overridden by explicit command line parameters.
+.TP
.SM CVS_RSH
.B cvs
uses the contents of this variable to determine the name of the
diff --git a/contrib/cvs/src/main.c b/contrib/cvs/src/main.c
index c016a02..6792245 100644
--- a/contrib/cvs/src/main.c
+++ b/contrib/cvs/src/main.c
@@ -12,7 +12,10 @@
*
*/
+/* $FreeBSD$ */
+
#include "cvs.h"
+#include "prepend_args.h"
#ifdef HAVE_WINSOCK_H
#include <winsock.h>
@@ -465,6 +468,8 @@ main (argc, argv)
logoff = 1;
}
+ prepend_default_options (getenv ("CVS_OPTIONS"), &argc, &argv);
+
/* Set this to 0 to force getopt initialization. getopt() sets
this to 1 internally. */
optind = 0;
diff --git a/contrib/cvs/src/prepend_args.c b/contrib/cvs/src/prepend_args.c
new file mode 100644
index 0000000..2c15a24
--- /dev/null
+++ b/contrib/cvs/src/prepend_args.c
@@ -0,0 +1,87 @@
+/* prepend_args.c - utilility programs for manpiulating argv[]
+ Copyright (C) 1999 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
+ 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. */
+
+/* $FreeBSD$ */
+
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include "cvs.h"
+#include "../diff/system.h"
+#include "prepend_args.h"
+
+
+/* Find the white-space-separated options specified by OPTIONS, and
+ using BUF to store copies of these options, set ARGV[0], ARGV[1],
+ etc. to the option copies. Return the number N of options found.
+ Do not set ARGV[N] to NULL. If ARGV is NULL, do not store ARGV[0]
+ etc. Backslash can be used to escape whitespace (and backslashes). */
+static int
+prepend_args (options, buf, argv)
+ char const *options;
+ char *buf;
+ char **argv;
+{
+ char const *o = options;
+ char *b = buf;
+ int n = 0;
+
+ for (;;)
+ {
+ while (ISSPACE ((unsigned char) *o))
+ o++;
+ if (!*o)
+ return n;
+ if (argv)
+ argv[n] = b;
+ n++;
+
+ do
+ if ((*b++ = *o++) == '\\' && *o)
+ b[-1] = *o++;
+ while (*o && ! ISSPACE ((unsigned char) *o));
+
+ *b++ = '\0';
+ }
+}
+
+/* Prepend the whitespace-separated options in OPTIONS to the argument
+ vector of a main program with argument count *PARGC and argument
+ vector *PARGV. */
+void
+prepend_default_options (options, pargc, pargv)
+ char const *options;
+ int *pargc;
+ char ***pargv;
+{
+ if (options)
+ {
+ char *buf = xmalloc (strlen (options) + 1);
+ int prepended = prepend_args (options, buf, (char **) NULL);
+ int argc = *pargc;
+ char * const *argv = *pargv;
+ char **pp = (char **) xmalloc ((prepended + argc + 1) * sizeof *pp);
+ *pargc = prepended + argc;
+ *pargv = pp;
+ *pp++ = *argv++;
+ pp += prepend_args (options, buf, pp);
+ while ((*pp++ = *argv++))
+ continue;
+ }
+}
diff --git a/contrib/cvs/src/prepend_args.h b/contrib/cvs/src/prepend_args.h
new file mode 100644
index 0000000..6708442
--- /dev/null
+++ b/contrib/cvs/src/prepend_args.h
@@ -0,0 +1,26 @@
+/* prepend_args.h - utilility programs for manpiulating argv[]
+ Copyright (C) 1999 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
+ 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. */
+
+/* $FreeBSD$ */
+
+/* This code, taken from GNU Grep, originally used the "PARAM" macro, as the
+ current GNU coding standards requires. Older GNU code used the "PROTO"
+ macro, before the GNU coding standards replaced it. We use the older
+ form here to keep from having to include another file in cvs/src/main.c. */
+
+void prepend_default_options PROTO ((char const *, int *, char ***));
OpenPOWER on IntegriCloud