diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2007-02-17 18:23:44 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2007-02-17 18:23:44 +0000 |
| commit | 9384a10810c060382177f59d1025e145cd63e903 (patch) | |
| tree | 630c82f79a631a855e6a3959d5ae96e602671c9a /usr.bin/cvs/config.c | |
| parent | 574a3af15cc4802db79e1bab0f6fb86a1be67e35 (diff) | |
cvs_path_cat() removal since we can now easily handle that
functionality w/ xsnprintf(); Initial diff started by thib@.
OK thib@ joris@.
Diffstat (limited to 'usr.bin/cvs/config.c')
| -rw-r--r-- | usr.bin/cvs/config.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/cvs/config.c b/usr.bin/cvs/config.c index 7def6425acc..2436b77f86b 100644 --- a/usr.bin/cvs/config.c +++ b/usr.bin/cvs/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.7 2007/01/25 08:21:08 otto Exp $ */ +/* $OpenBSD: config.c,v 1.8 2007/02/17 18:23:43 xsa Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -31,9 +31,8 @@ cvs_parse_configfile(void) const char *errstr; char *p, *buf, *lbuf, *opt, *val, fpath[MAXPATHLEN]; - if (cvs_path_cat(current_cvsroot->cr_dir, CVS_PATH_CONFIG, - fpath, sizeof(fpath)) >= sizeof(fpath)) - fatal("cvs_parse_configfile: truncation"); + (void)xsnprintf(fpath, sizeof(fpath), "%s/%s", + current_cvsroot->cr_dir, CVS_PATH_CONFIG); cvs_log(LP_TRACE, "cvs_parse_configfile(%s)", fpath); |