[Cvs-cvs] Changes to ccvs/src/rcs.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/rcs.c
diff -u ccvs/src/rcs.c:1.356.4.1 ccvs/src/rcs.c:1.356.4.2
--- ccvs/src/rcs.c:1.356.4.1    Thu Oct 20 21:33:11 2005
+++ ccvs/src/rcs.c      Fri Oct 28 02:35:13 2005
@@ -21,11 +21,15 @@
 /* Verify interface.  */
 #include "rcs.h"
 
+/* CVS headers.  */
 #include "cvs.h"
 #include "edit.h"
 #include "hardlink.h"
 #include "sign.h"
 
+/* GNULIB headers.  */
+#include "base64.h"
+
 /* These need to be source after cvs.h or HAVE_MMAP won't be set... */
 #ifdef HAVE_MMAP
 # include "getpagesize.h"
@@ -5125,12 +5129,17 @@
     if (get_sign_commits (server_active, true)
        || have_sigfile (server_active, workfile))
     {
+       char *rawsig;
+       size_t rawlen;
+
        np = getnode();
        np->type = RCSSTRING;
        np->key = xstrdup ("openpgp-signatures");
-       np->data = get_signature (server_active, "", workfile,
-                                 rcs->expand && STREQ (rcs->expand, "b"),
-                                 &np->len);
+       rawsig = get_signature (server_active, "", workfile,
+                               rcs->expand && STREQ (rcs->expand, "b"),
+                               &rawlen);
+       np->len = base64_encode_alloc (rawsig, rawlen, (char **)&np->data);
+       free (rawsig);
        addnode (delta->other_delta, np);
     }
 
@@ -7770,6 +7779,7 @@
            vnode->state = xstrdup (RCSDEAD);
            continue;
        }
+
        /* if we have a new revision number, we're done with this delta */
        for (cp = key;
             (isdigit ((unsigned char) *cp) || *cp == '.') && *cp != '\0';