diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-01-27 19:38:20 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-01-27 19:38:20 +0000 |
| commit | eecd6a62ce7509e40fb08c6092919f8a9154e753 (patch) | |
| tree | b75f02292aaa6fe9e6c3013924074bfff6494455 /usr.bin/cvs | |
| parent | 308d11c5db6c5748177a659837e933864958c9b2 (diff) | |
preserve flags in Entries in the remote case. ok xsa@ joris@
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c index adf2fed51f6..0d105d25d46 100644 --- a/usr.bin/cvs/client.c +++ b/usr.bin/cvs/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.54 2007/01/26 21:59:11 otto Exp $ */ +/* $OpenBSD: client.c,v 1.55 2007/01/27 19:38:19 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -467,7 +467,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/%s", cf->file_name, (cf->file_status == FILE_REMOVED) ? "-" : "", rev, timebuf, cf->file_ent->ce_opts ? cf->file_ent->ce_opts : "", sticky); @@ -648,8 +648,8 @@ cvs_client_updated(char *data) e = cvs_ent_parse(en); xfree(en); rcsnum_tostr(e->ce_rev, revbuf, sizeof(revbuf)); - l = snprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s//", e->ce_name, - revbuf, timebuf); + l = snprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s/%s/", e->ce_name, + revbuf, timebuf, e->ce_opts ? e->ce_opts : ""); if (l == -1 || l >= CVS_ENT_MAXLINELEN) fatal("cvs_client_updated: overflow"); |