diff options
Diffstat (limited to 'usr.bin/cvs/status.c')
| -rw-r--r-- | usr.bin/cvs/status.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c index 9c0ea493e78..c4f102cf516 100644 --- a/usr.bin/cvs/status.c +++ b/usr.bin/cvs/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.39 2005/07/10 13:58:19 xsa Exp $ */ +/* $OpenBSD: status.c,v 1.40 2005/07/14 06:54:59 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -180,9 +180,7 @@ cvs_status_local(CVSFILE *cf, void *arg) size_t n; char buf[MAXNAMLEN], fpath[MAXPATHLEN], rcspath[MAXPATHLEN]; char numbuf[64], timebuf[32]; - char *repo; RCSFILE *rf; - struct cvsroot *root; if (cf->cf_type == DT_DIR) { if (verbosity > 1) @@ -190,18 +188,10 @@ cvs_status_local(CVSFILE *cf, void *arg) return (0); } - root = CVS_DIR_ROOT(cf); - repo = CVS_DIR_REPO(cf); - cvs_file_getpath(cf, fpath, sizeof(fpath)); - len = snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s", - root->cr_dir, repo, CVS_FILE_NAME(cf), RCS_FILE_EXT); - if (len == -1 || len >= (int)sizeof(rcspath)) { - errno = ENAMETOOLONG; - cvs_log(LP_ERRNO, "%s", rcspath); + if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL) return (CVS_EX_DATA); - } if (cf->cf_cvstat != CVS_FST_UNKNOWN && cf->cf_cvstat != CVS_FST_ADDED) { |