diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-10 11:52:36 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-10 11:52:36 +0000 |
| commit | 49e48e8721fbffc030c2f9ea3d90f86bc5af8f7f (patch) | |
| tree | 7189297ab3d705ceb7c0256d67e43f73ee089255 /usr.bin/cvs | |
| parent | c19110d2d2c8ea8567f3df73c4c03734ecb15c78 (diff) | |
- cvs_write_tagfile() is not responsible to remove CVS/Tag itself
- construct right CVS/Repository paths in cvs_mkpath()
fixes remote Issues;
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/entries.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/util.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c index cc751d8403a..0dd216bd526 100644 --- a/usr.bin/cvs/entries.c +++ b/usr.bin/cvs/entries.c @@ -1,4 +1,4 @@ -/* $OpenBSD: entries.c,v 1.92 2008/02/10 10:21:42 joris Exp $ */ +/* $OpenBSD: entries.c,v 1.93 2008/02/10 11:52:35 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -517,7 +517,5 @@ cvs_write_tagfile(const char *dir, char *tag, char *date) (void)fprintf(fp, "%s\n", sticky); (void)fclose(fp); - } else { - (void)cvs_unlink(tagpath); } } diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c index dac31a9c9c2..9db61d7b254 100644 --- a/usr.bin/cvs/util.c +++ b/usr.bin/cvs/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.135 2008/02/09 20:04:00 xsa Exp $ */ +/* $OpenBSD: util.c,v 1.136 2008/02/10 11:52:35 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org> @@ -585,7 +585,7 @@ cvs_mkpath(const char *path, char *tag) len = strlcpy(repo, module_repo_root, sizeof(repo)); if (len >= (int)sizeof(repo)) fatal("cvs_mkpath: overflow"); - } else { + } else if (strcmp(sp, ".")) { if (repo[0] != '\0') { len = strlcat(repo, "/", sizeof(repo)); if (len >= (int)sizeof(repo)) |