summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2006-07-09 04:39:44 +0000
committerJoris Vink <joris@cvs.openbsd.org>2006-07-09 04:39:44 +0000
commit9f4178d121fa4ad172dc273903e99751eb6ba2ad (patch)
treea5cefbe164d722d1e3f3d685a93808931e4e947d /usr.bin
parent20d3a6465006e13095c3c051d8ac2d07ea5018e1 (diff)
put the sticky tag if any in the correct place in the entries line when sending it to the server
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/client.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index baf3f4cda74..2a977f24dc1 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.12 2006/07/09 01:47:20 joris Exp $ */
+/* $OpenBSD: client.c,v 1.13 2006/07/09 04:39:43 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -372,7 +372,7 @@ cvs_client_sendfile(struct cvs_file *cf)
fatal("cvs_client_sendfile: overflow");
}
- cvs_client_send_request("Entry /%s/%s%s/%s/%s/",
+ cvs_client_send_request("Entry /%s/%s%s/%s//%s",
cf->file_name, (cf->file_status == FILE_REMOVED) ? "-" : "",
rev, timebuf, sticky);
}
@@ -598,6 +598,10 @@ cvs_client_merged(char *data)
void
cvs_client_removed(char *data)
{
+ char *dir;
+
+ dir = cvs_remote_input();
+ xfree(dir);
}
void