Group the output chunks differently, to try to match BSD/OS output. Switch

to using arithmatic to determine buffer sizes to encode into.

Diane Bruce pointed out to me that BSD/OS did MIME too, so I want to match
their output, too, since my decision of 8 output groups was wholly arbitrary.

1 files changed, 6 insertions, 3 deletions

diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 96c3370..e50c94c 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -142,9 +142,12 @@ main(int argc, char *argv[])
 void
 base64_encode(void)
 {
-#define	GROUPS	8 /* Group output chunks */
-	unsigned char buf[6];
-	char buf2[16];
+	/*
+	 * Output must fit into 80 columns, chunks come in 4, leave 1.
+	 */
+#define	GROUPS	((80 / 4) - 1)
+	unsigned char buf[3];
+	char buf2[sizeof(buf) * 2 + 1];
 	size_t n;
 	int rv, sequence;