diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-05-20 19:37:40 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-05-20 19:37:40 +0000 |
| commit | aa5eb18a21fe9f180b8304bd00d351452feb19e7 (patch) | |
| tree | e3fa53916aef68822022b48abb08361c63b5d251 /usr.bin | |
| parent | c36f2ab1b0804964e0cad66e52ab793b7bef8d0a (diff) | |
do not hardcode 'CVS/Root' but rather use defined CVS_PATH_ROOTSPEC;
ok jfb joris
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/root.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c index e9dc8db2bfe..78ffd0950c6 100644 --- a/usr.bin/cvs/root.c +++ b/usr.bin/cvs/root.c @@ -1,4 +1,4 @@ -/* $OpenBSD: root.c,v 1.16 2005/04/16 19:05:02 xsa Exp $ */ +/* $OpenBSD: root.c,v 1.17 2005/05/20 19:37:39 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -284,13 +284,15 @@ cvsroot_get(const char *dir) else return (NULL); } else { - cvs_log(LP_ERRNO, "failed to open CVS/Root"); + cvs_log(LP_ERRNO, "failed to open %s", + CVS_PATH_ROOTSPEC); return (NULL); } } if (fgets(line, sizeof(line), fp) == NULL) { - cvs_log(LP_ERR, "failed to read CVSROOT line from CVS/Root"); + cvs_log(LP_ERR, "failed to read CVSROOT line from %s", + CVS_PATH_ROOTSPEC); (void)fclose(fp); return (NULL); } @@ -298,7 +300,7 @@ cvsroot_get(const char *dir) len = strlen(line); if (len == 0) - cvs_log(LP_WARN, "empty CVS/Root file"); + cvs_log(LP_WARN, "empty %s file", CVS_PATH_ROOTSPEC); else if (line[len - 1] == '\n') line[--len] = '\0'; |