diff options
| author | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-07-30 23:12:14 +0000 |
|---|---|---|
| committer | Jean-Francois Brousseau <jfb@cvs.openbsd.org> | 2004-07-30 23:12:14 +0000 |
| commit | a02fcf948076ab3705129493ccd3c26346d8f004 (patch) | |
| tree | ab9c1a5b811615b01624e2f6498384d16361ebd0 | |
| parent | 9ed597bcd3162ff9b35b27c1c8886daeacf87304 (diff) | |
Remove remaining references to cvs_root
| -rw-r--r-- | usr.bin/cvs/init.c | 7 | ||||
| -rw-r--r-- | usr.bin/cvs/server.c | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/cvs/init.c b/usr.bin/cvs/init.c index ba1a93f3051..dfd1466d0ff 100644 --- a/usr.bin/cvs/init.c +++ b/usr.bin/cvs/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.3 2004/07/29 18:23:25 jfb Exp $ */ +/* $OpenBSD: init.c,v 1.4 2004/07/30 23:12:13 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -83,12 +83,15 @@ cvs_init(int argc, char **argv) char path[MAXPATHLEN]; RCSFILE *rfp; struct stat st; + struct cvsroot *root; if (argc != 1) return (EX_USAGE); + root = cvsroot_get("."); + for (i = 0; i < sizeof(cvsroot_files)/sizeof(cvsroot_files[i]); i++) { - snprintf(path, sizeof(path), "%s/%s", cvs_root->cr_dir, + snprintf(path, sizeof(path), "%s/%s", root->cr_dir, cvsroot_files[i].cf_path); if (cvsroot_files[i].cf_type == CFT_DIR) { diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c index 47be210f8fb..0319726232c 100644 --- a/usr.bin/cvs/server.c +++ b/usr.bin/cvs/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.3 2004/07/29 18:23:25 jfb Exp $ */ +/* $OpenBSD: server.c,v 1.4 2004/07/30 23:12:12 jfb Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -66,6 +66,7 @@ cvs_server(int argc, char **argv) { ssize_t ret; char reqbuf[128]; + struct cvsroot *root; if (argc != 1) { return (EX_USAGE); @@ -81,7 +82,7 @@ cvs_server(int argc, char **argv) } - if (cvs_sock_connect(cvs_root->cr_dir) < 0) { + if (cvs_sock_connect(root->cr_dir) < 0) { cvs_log(LP_ERR, "failed to connect to CVS server socket"); return (-1); } |