summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/cvs.c
diff options
context:
space:
mode:
authorRay Lai <ray@cvs.openbsd.org>2007-05-26 20:45:27 +0000
committerRay Lai <ray@cvs.openbsd.org>2007-05-26 20:45:27 +0000
commiteeda9e4e6299d18803b4f9cc1bc0a32d7879bac9 (patch)
tree9b3923f2b1cc1c0b234e7e6f0c7f4339ae3b8f53 /usr.bin/cvs/cvs.c
parent916e55bf40e0723b23c4a91b965bd2723cf0ae81 (diff)
cvs_server_path is more appropriate to check than cvs_server_active.
From Tobias Stoeckmann. OK niallo@
Diffstat (limited to 'usr.bin/cvs/cvs.c')
-rw-r--r--usr.bin/cvs/cvs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index 52ebdaf61f3..0a6f391e901 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cvs.c,v 1.123 2007/05/22 16:47:22 xsa Exp $ */
+/* $OpenBSD: cvs.c,v 1.124 2007/05/26 20:45:26 ray Exp $ */
/*
* Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -104,12 +104,13 @@ cvs_cleanup(void)
cvs_log(LP_TRACE, "cvs_cleanup: removing temp files");
cvs_worklist_run(&temp_files, cvs_worklist_unlink);
- if (cvs_server_active) {
+ if (cvs_server_path != NULL) {
if (cvs_rmdir(cvs_server_path) == -1)
cvs_log(LP_ERR,
"warning: failed to remove server directory: %s",
cvs_server_path);
xfree(cvs_server_path);
+ cvs_server_path = NULL;
}
}