diff options
| author | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-08-06 13:08:40 +0000 |
|---|---|---|
| committer | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-08-06 13:08:40 +0000 |
| commit | e8cff797fd0aa9299d0fea90914b6c164b05d758 (patch) | |
| tree | 92e71984d2012386d5fb2921cbb9de5c38a09784 /usr.bin/cvs | |
| parent | dfbf55fea93bd266600a2c325117688eb6d26a56 (diff) | |
Start using the global files list
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/checkout.c | 11 | ||||
| -rw-r--r-- | usr.bin/cvs/diff.c | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index 93e764254c2..bc6803994a1 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.7 2004/08/03 04:56:27 jfb Exp $ */ +/* $OpenBSD: checkout.c,v 1.8 2004/08/06 13:08:39 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -51,7 +51,6 @@ int cvs_checkout(int argc, char **argv) { int ch; - CVSFILE *dir; struct cvsroot *root; while ((ch = getopt(argc, argv, "")) != -1) { @@ -70,20 +69,20 @@ cvs_checkout(int argc, char **argv) return (EX_USAGE); } - dir = cvs_file_get(".", CF_IGNORE); - root = CVS_DIR_ROOT(dir); + cvs_files = cvs_file_get(".", CF_IGNORE); + root = CVS_DIR_ROOT(cvs_files); if (root->cr_method != CVS_METHOD_LOCAL) { cvs_connect(root); } cvs_sendarg(root, argv[0], 0); - cvs_senddir(root, dir); + cvs_senddir(root, cvs_files); cvs_sendreq(root, CVS_REQ_XPANDMOD, NULL); /* XXX not too sure why we have to send this arg */ cvs_sendarg(root, "-N", 0); cvs_sendarg(root, argv[0], 0); - cvs_senddir(root, dir); + cvs_senddir(root, cvs_files); cvs_sendreq(root, CVS_REQ_CO, NULL); return (0); diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 14e7c879329..61f1bb9eb4d 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.5 2004/07/30 20:55:35 jfb Exp $ */ +/* $OpenBSD: diff.c,v 1.6 2004/08/06 13:08:39 jfb Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -351,7 +351,6 @@ int cvs_diff(int argc, char **argv) { int ch, recurse, flags; - struct cvs_file *files; struct diff_arg darg; struct cvsroot *root; @@ -413,16 +412,16 @@ cvs_diff(int argc, char **argv) argv += optind; if (argc == 0) { - files = cvs_file_get(".", flags); + cvs_files = cvs_file_get(".", flags); } else - files = cvs_file_getspec(argv, argc, 0); + cvs_files = cvs_file_getspec(argv, argc, 0); - cvs_file_examine(files, cvs_diff_file, &darg); + cvs_file_examine(cvs_files, cvs_diff_file, &darg); - root = files->cf_ddat->cd_root; + root = cvs_files->cf_ddat->cd_root; if (root->cr_method != CVS_METHOD_LOCAL) { - cvs_senddir(root, files); + cvs_senddir(root, cvs_files); cvs_sendreq(root, CVS_REQ_DIFF, NULL); } |