diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-05-24 20:04:44 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-05-24 20:04:44 +0000 |
| commit | 0f7c34393ce93bad18649e843389dcd918e2303b (patch) | |
| tree | 3e77c8982af7d2bbae1c1dbd3e1fbc4a63ae5c6d /usr.bin/cvs/file.c | |
| parent | 3c07aef93dcbaa855eaba9b2490367a4e84164b2 (diff) | |
- simplify cvs_mkadmin().
- create the correct base paths in checkout.
- remove the CVS_CMD_SENDARGS2 flag for checkout, it doesn't need it.
okay jfb@
Diffstat (limited to 'usr.bin/cvs/file.c')
| -rw-r--r-- | usr.bin/cvs/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index ae5d78294dd..f109e3fb599 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.77 2005/05/24 04:12:25 jfb Exp $ */ +/* $OpenBSD: file.c,v 1.78 2005/05/24 20:04:43 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -269,7 +269,8 @@ cvs_file_create(CVSFILE *parent, const char *path, u_int type, mode_t mode) return (NULL); } - if ((mkdir(path, mode) == -1) || (cvs_mkadmin(cfp, mode) < 0)) { + if ((mkdir(path, mode) == -1) || + (cvs_mkadmin(path, cfp->cf_root->cr_str, cfp->cf_repo) < 0)) { cvs_file_free(cfp); return (NULL); } @@ -574,7 +575,7 @@ cvs_load_dirinfo(CVSFILE *cf, int flags) return (-1); if (flags & CF_MKADMIN) - cvs_mkadmin(cf, 0755); + cvs_mkadmin(fpath, cf->cf_root->cr_str, NULL); /* if the CVS administrative directory exists, load the info */ l = snprintf(pbuf, sizeof(pbuf), "%s/" CVS_PATH_CVSDIR, fpath); |