diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-10 10:05:41 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-10 10:05:41 +0000 |
| commit | 93f38e798dbadd8cdba2df89a71474ae338ab7e5 (patch) | |
| tree | fc436e20062b01797034d8ba4cb7bb900ca01b8a /usr.bin/cvs/cvs.c | |
| parent | b6be805f5238bfe5b48e07d480f05445ce8a6c3f (diff) | |
Simply the use of cmdp and cvs_command by zapping cvs_command and working
solely with cmdp. This remedies some reliability issues with invalid
commands supplied and also fixes a GNU cvs style incompatibility with
release command.
> Based on patch from Igor Zinovik
Diffstat (limited to 'usr.bin/cvs/cvs.c')
| -rw-r--r-- | usr.bin/cvs/cvs.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index f948fb9569c..db9458eea48 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.139 2007/10/07 18:14:09 chl Exp $ */ +/* $OpenBSD: cvs.c,v 1.140 2008/01/10 10:05:40 tobias Exp $ */ /* * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -59,7 +59,6 @@ int cvs_server_active = 0; char *cvs_tagname = NULL; char *cvs_defargs; /* default global arguments from .cvsrc */ -char *cvs_command; /* name of the command we are running */ char *cvs_rootstr; char *cvs_rsh = CVS_RSH_DEFAULT; char *cvs_editor = CVS_EDITOR_DEFAULT; @@ -68,6 +67,7 @@ char *cvs_msg = NULL; char *cvs_tmpdir = CVS_TMPDIR_DEFAULT; struct cvsroot *current_cvsroot = NULL; +struct cvs_cmd *cmdp; /* struct of command we are running */ int cvs_getopt(int, char **); __dead void usage(void); @@ -128,7 +128,6 @@ main(int argc, char **argv) { char *envstr, *cmd_argv[CVS_CMD_MAXARG], **targv; int i, ret, cmd_argc; - struct cvs_cmd *cmdp; struct passwd *pw; struct stat st; char fpath[MAXPATHLEN]; @@ -172,8 +171,6 @@ main(int argc, char **argv) if (argc == 0) usage(); - cvs_command = argv[0]; - /* * check the tmp dir, either specified through * the environment variable TMPDIR, or via @@ -184,9 +181,9 @@ main(int argc, char **argv) else if (!S_ISDIR(st.st_mode)) fatal("`%s' is not valid temporary directory", cvs_tmpdir); - cmdp = cvs_findcmd(cvs_command); + cmdp = cvs_findcmd(argv[0]); if (cmdp == NULL) { - fprintf(stderr, "Unknown command: `%s'\n\n", cvs_command); + fprintf(stderr, "Unknown command: `%s'\n\n", argv[0]); fprintf(stderr, "CVS commands are:\n"); for (i = 0; cvs_cdt[i] != NULL; i++) fprintf(stderr, "\t%-16s%s\n", @@ -396,7 +393,7 @@ cvs_read_rcfile(void) char rcpath[MAXPATHLEN], *buf, *lbuf, *lp, *p; int cmd_parsed, cvs_parsed, i, linenum; size_t len, pos; - struct cvs_cmd *cmdp, *tcmdp; + struct cvs_cmd *tcmdp; FILE *fp; linenum = 0; @@ -415,10 +412,6 @@ cvs_read_rcfile(void) return; } - cmdp = cvs_findcmd(cvs_command); - if (cmdp == NULL) - fatal("unknown command `%s'", cvs_command); - cmd_parsed = cvs_parsed = 0; lbuf = NULL; while ((buf = fgetln(fp, &len)) != NULL) { |