5347N/Asolaris now provides its own b64_encode which
5347N/Aconflicts with our private one.
5347N/A
5347N/A--- libarchive-3.1.2/libarchive/archive_write_add_filter_b64encode.c.orig Sun Jan 24 10:08:09 2016
5347N/A+++ libarchive-3.1.2/libarchive/archive_write_add_filter_b64encode.c Sun Jan 24 10:08:54 2016
5347N/A@@ -60,7 +60,7 @@
5347N/A const void *, size_t);
5347N/A static int archive_filter_b64encode_close(struct archive_write_filter *);
5347N/A static int archive_filter_b64encode_free(struct archive_write_filter *);
5347N/A-static void b64_encode(struct archive_string *, const unsigned char *, size_t);
5347N/A+static void archive_private_b64_encode(struct archive_string *, const unsigned char *, size_t);
5347N/A static int64_t atol8(const char *, size_t);
5347N/A
5347N/A static const char base64[] = {
5347N/A@@ -180,7 +180,7 @@
5347N/A }
5347N/A
5347N/A static void
5347N/A-b64_encode(struct archive_string *as, const unsigned char *p, size_t len)
5347N/A+archive_private_b64_encode(struct archive_string *as, const unsigned char *p, size_t len)
5347N/A {
5347N/A int c;
5347N/A
5347N/A@@ -234,12 +234,12 @@
5347N/A }
5347N/A if (state->hold_len < LBYTES)
5347N/A return (ret);
5347N/A- b64_encode(&state->encoded_buff, state->hold, LBYTES);
5347N/A+ archive_private_b64_encode(&state->encoded_buff, state->hold, LBYTES);
5347N/A state->hold_len = 0;
5347N/A }
5347N/A
5347N/A for (; length >= LBYTES; length -= LBYTES, p += LBYTES)
5347N/A- b64_encode(&state->encoded_buff, p, LBYTES);
5347N/A+ archive_private_b64_encode(&state->encoded_buff, p, LBYTES);
5347N/A
5347N/A /* Save remaining bytes. */
5347N/A if (length > 0) {
5347N/A@@ -270,7 +270,7 @@
5347N/A
5347N/A /* Flush remaining bytes. */
5347N/A if (state->hold_len != 0)
5347N/A- b64_encode(&state->encoded_buff, state->hold, state->hold_len);
5347N/A+ archive_private_b64_encode(&state->encoded_buff, state->hold, state->hold_len);
5347N/A archive_string_sprintf(&state->encoded_buff, "====\n");
5347N/A /* Write the last block */
5347N/A archive_write_set_bytes_in_last_block(f->archive, 1);