Rewrite based on wget uuencode function.

Saves aprox. 200 Bytes and in future can use common code between
this and wget if BB_FEATURE_WGET_AUTHENTICATION is defined.

2 files changed, 340 insertions, 438 deletions

diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 35a533309..d46fb1588 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -1,237 +1,188 @@
-/* uuencode.c -- uuencode utility.
- * Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+/* vi: set sw=4 ts=4: */
+/*
+ *  Copyright (C) 2000 by Glenn McGrath
  *
- * This product is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ *  based on the function base64_encode from http.c in wget v1.6
+ *  Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
  *
- * This product is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this product; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
  *
- * Original copyright notice is retained at the end of this file.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-/* Reworked to GNU style by Ian Lance Taylor, ian@airs.com, August 93.  */
-/* Hacked to work with BusyBox by Alfred M. Szmidt */
-
-
-
-#include <stdio.h>
-#include <errno.h>
 #include <getopt.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "busybox.h"
 
-#define	RW (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
-
-static void encode __P ((void));
-
-/* Pointer to the translation table we currently use.  */
-static const char *trans_ptr;
-
-/* The two currently defined translation tables.  The first is the
-   standard uuencoding, the second is base64 encoding.  */
-static const char uu_std[64] = {
-  '`', '!', '"', '#', '$', '%', '&', '\'',
-  '(', ')', '*', '+', ',', '-', '.', '/',
-  '0', '1', '2', '3', '4', '5', '6', '7',
-  '8', '9', ':', ';', '<', '=', '>', '?',
-  '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
-  'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-  'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-  'X', 'Y', 'Z', '[', '\\', ']', '^', '_'
+/* Conversion table.  for base 64 */
+static char tbl_base64[64] = {
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+	'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+	'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+	'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+	'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+	'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+	'w', 'x', 'y', 'z', '0', '1', '2', '3',
+	'4', '5', '6', '7', '8', '9', '+', '/'
 };
 
-static const char uu_base64[64] = {
-  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-  'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-  'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-  'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-  'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-  'w', 'x', 'y', 'z', '0', '1', '2', '3',
-  '4', '5', '6', '7', '8', '9', '+', '/'
+static char tbl_std[64] = {
+	'`', '!', '"', '#', '$', '%', '&', '\'',
+	'(', ')', '*', '+', ',', '-', '.', '/',
+	'0', '1', '2', '3', '4', '5', '6', '7',
+	'8', '9', ':', ';', '<', '=', '>', '?',
+	'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+	'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+	'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+	'X', 'Y', 'Z', '[', '\\', ']', '^', '_'
 };
 
-/* ENC is the basic 1 character encoding function to make a char printing.  */
-#define ENC(Char) (trans_ptr[(Char) & 077])
-
-/* Copy from IN to OUT, encoding as you go along. */
-static void encode()
+/*
+ * Encode the string S of length LENGTH to base64 format and place it
+ * to STORE.  STORE will be 0-terminated, and must point to a writable
+ * buffer of at least 1+BASE64_LENGTH(length) bytes.
+ * where BASE64_LENGTH(len) = (4 * ((LENGTH + 2) / 3))
+ */
+static void base64_encode (const char *s, const char *store, const int length, const char *tbl)
 {
-  register int ch, n;
-  char *p = NULL;
-  char buf[80];
-
-  while (1) {
-    n = 0;
-    do {
-      register int m = fread (buf, 1, 45 - n, stdin);
-      if (m == 0)
-        break;
-      n += m;
-    }
-    while (n < 45);
-
-    if (n == 0)
-      break;
-
-    if (trans_ptr == uu_std)
-      if (putchar (ENC (n)) == EOF)
-        break;
-    for (p = buf; n > 2; n -= 3, p += 3) {
-      ch = *p >> 2;
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-      ch = ((*p << 4) & 060) | ((p[1] >> 4) & 017);
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-      ch = ((p[1] << 2) & 074) | ((p[2] >> 6) & 03);
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-      ch = p[2] & 077;
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-    }
-
-    if (n != 0)
-      break;
-
-    if (putchar ('\n') == EOF)
-      break;
-  }
-
-  while (n != 0) {
-    char c1 = *p;
-    char c2 = n == 1 ? 0 : p[1];
-
-    ch = c1 >> 2;
-    ch = ENC (ch);
-    if (putchar (ch) == EOF)
-      break;
-
-    ch = ((c1 << 4) & 060) | ((c2 >> 4) & 017);
-    ch = ENC (ch);
-    if (putchar (ch) == EOF)
-      break;
-
-    if (n == 1)
-      ch = trans_ptr == uu_std ? ENC ('\0') : '=';
-    else {
-      ch = (c2 << 2) & 074;
-      ch = ENC (ch);
-    }
-    if (putchar (ch) == EOF)
-      break;
-    ch = trans_ptr == uu_std ? ENC ('\0') : '=';
-    if (putchar (ch) == EOF)
-      break;
-    putchar ('\n');
-    break;
-  }
-
-  if (ferror (stdin))
-    error_msg("Read error");
-
-  if (trans_ptr == uu_std) {
-    putchar (ENC ('\0'));
-    putchar ('\n');
-  }
+	int i;
+	unsigned char *p = (unsigned char *)store;
+
+	/* Transform the 3x8 bits to 4x6 bits, as required by base64.  */
+	for (i = 0; i < length; i += 3) {
+		*p++ = tbl[s[0] >> 2];
+		*p++ = tbl[((s[0] & 3) << 4) + (s[1] >> 4)];
+		*p++ = tbl[((s[1] & 0xf) << 2) + (s[2] >> 6)];
+		*p++ = tbl[s[2] & 0x3f];
+		s += 3;
+	}
+	/* Pad the result if necessary...  */
+	if (i == length + 1) {
+		*(p - 1) = '=';
+	}
+	else if (i == length + 2) {
+		*(p - 1) = *(p - 2) = '=';
+	}
+	/* ...and zero-terminate it.  */
+	*p = '\0';
 }
 
-int uuencode_main (int argc,
-                   char **argv)
+int uuencode_main(int argc, char **argv)
 {
-  int opt;
-  struct stat sb;
-  int mode;
-
-  trans_ptr = uu_std;      /* Standard encoding is old uu format */
-
-  /* Parse any options */
-  while ((opt = getopt (argc, argv, "m")) > 0) {
-    switch (opt) {
-     case 'm':
-      trans_ptr = uu_base64;
-      break;
-
-     default:
-      show_usage();
-    }
-  }
-
-  switch (argc - optind) {
-   case 2:
-    /* Optional first argument is input file.  */
-    if (!freopen (argv[optind], "r", stdin) || fstat (fileno (stdin), &sb)) {
-      perror_msg("%s", argv[optind]);
-      return EXIT_FAILURE;
-    }
-    mode = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
-    optind++;
-    break;
-
-   case 1:
-    mode = RW & ~umask (RW);
-    break;
-
-   case 0:
-   default:
-    show_usage();
-  }
-
-  printf("begin%s %o %s\n", trans_ptr == uu_std ? "" : "-base64",
-            mode, argv[optind]);
-  encode();
-  printf(trans_ptr == uu_std ? "end\n" : "====\n");
-  if (ferror (stdout)) {
-    error_msg("Write error");
-    return EXIT_FAILURE;
-  }
-  return EXIT_SUCCESS;
+	const int src_buf_size = BUFSIZ;	// This *MUST* be a multiple of 3
+	const int dst_buf_size = 4 * ((src_buf_size + 2) / 3);
+	RESERVE_BB_BUFFER(src_buf, src_buf_size + 1);
+	RESERVE_BB_BUFFER(dst_buf, dst_buf_size + 1);
+	struct stat stat_buf;
+	FILE *src_stream = stdin;
+	char *tbl = tbl_std;
+	size_t size;
+	mode_t mode;
+	int opt;
+	int column = 0;
+	int write_size;
+	int remaining;
+	int buffer_offset = 0;
+
+	while ((opt = getopt(argc, argv, "m")) != -1) {
+		switch (opt) {
+		case 'm':
+			tbl = tbl_base64;
+   			break;
+		default:
+			show_usage();
+		}
+	}
+
+	switch (argc - optind) {
+		case 2:
+			src_stream = xfopen(argv[optind], "r");
+			stat(argv[optind], &stat_buf);
+			mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+			if (src_stream == stdout) {
+				printf("NULL\n");
+			}
+			break;
+		case 1:
+			mode = umask(0666);
+			break;
+		default:
+			show_usage();
+	}
+
+	printf("begin%s %o %s", tbl == tbl_std ? "" : "-base64", mode, argv[argc - 1]);
+
+	while ((size = fread(src_buf, 1, src_buf_size, src_stream)) > 0) {
+		/* Encode the buffer we just read in */
+		base64_encode(src_buf, dst_buf, size, tbl);
+
+		/* Write the buffer to stdout, wrapping at 60 chars.
+		 * This looks overly complex, but it gets tricky as
+		 * the line has to continue to wrap correctly if we
+		 * have to refill the buffer
+		 *
+		 * Improvments most welcome
+		 */
+
+		/* Initialise values for the new buffer */
+		remaining = 4 * ((size + 2) / 3);
+		buffer_offset = 0;
+		if (remaining > (60 - column)) {
+			write_size = 60 - column;
+		}
+		else if (remaining < 60) {
+			write_size = remaining;
+		} else {
+			write_size = 60;
+		}
+
+		/* Write the buffer to stdout, wrapping at 60 chars
+		 * starting from the column the last buffer ran out
+		 */
+		do {
+			/* Setup a new row if required */
+			if (column == 0) {
+				putchar('\n');
+				if (tbl == tbl_std) {
+					putchar('M');
+				}
+			}
+			/* Write to the 60th column */
+			if (fwrite(&dst_buf[buffer_offset], 1, write_size, stdout) != write_size) {
+				perror("Couldnt finish writing");
+			}
+			/* Update variables based on last write */
+			buffer_offset += write_size;
+			remaining -= write_size;
+			column += write_size;
+			if (column % 60 == 0) {
+				column = 0;
+			}
+
+			/* working next amount to write */
+			write_size = (60 - column) % 60;
+			if (write_size < remaining) {
+				write_size = remaining;
+			}
+			if (write_size == 0) {
+				write_size = 60;
+			}
+		} while (remaining > 0);
+	}
+	printf(tbl == tbl_std ? "\n`\nend\n" : "\n====\n");
+
+	return(EXIT_SUCCESS);
 }
-
-/* Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change 
- *		ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 
- *
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-
diff --git a/uuencode.c b/uuencode.c
index 35a533309..d46fb1588 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,237 +1,188 @@
-/* uuencode.c -- uuencode utility.
- * Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+/* vi: set sw=4 ts=4: */
+/*
+ *  Copyright (C) 2000 by Glenn McGrath
  *
- * This product is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ *  based on the function base64_encode from http.c in wget v1.6
+ *  Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
  *
- * This product is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- * You should have received a copy of the GNU General Public License
- * along with this product; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
  *
- * Original copyright notice is retained at the end of this file.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-/* Reworked to GNU style by Ian Lance Taylor, ian@airs.com, August 93.  */
-/* Hacked to work with BusyBox by Alfred M. Szmidt */
-
-
-
-#include <stdio.h>
-#include <errno.h>
 #include <getopt.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "busybox.h"
 
-#define	RW (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
-
-static void encode __P ((void));
-
-/* Pointer to the translation table we currently use.  */
-static const char *trans_ptr;
-
-/* The two currently defined translation tables.  The first is the
-   standard uuencoding, the second is base64 encoding.  */
-static const char uu_std[64] = {
-  '`', '!', '"', '#', '$', '%', '&', '\'',
-  '(', ')', '*', '+', ',', '-', '.', '/',
-  '0', '1', '2', '3', '4', '5', '6', '7',
-  '8', '9', ':', ';', '<', '=', '>', '?',
-  '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
-  'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-  'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-  'X', 'Y', 'Z', '[', '\\', ']', '^', '_'
+/* Conversion table.  for base 64 */
+static char tbl_base64[64] = {
+	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+	'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+	'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+	'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+	'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+	'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+	'w', 'x', 'y', 'z', '0', '1', '2', '3',
+	'4', '5', '6', '7', '8', '9', '+', '/'
 };
 
-static const char uu_base64[64] = {
-  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-  'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-  'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-  'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-  'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-  'w', 'x', 'y', 'z', '0', '1', '2', '3',
-  '4', '5', '6', '7', '8', '9', '+', '/'
+static char tbl_std[64] = {
+	'`', '!', '"', '#', '$', '%', '&', '\'',
+	'(', ')', '*', '+', ',', '-', '.', '/',
+	'0', '1', '2', '3', '4', '5', '6', '7',
+	'8', '9', ':', ';', '<', '=', '>', '?',
+	'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+	'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+	'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+	'X', 'Y', 'Z', '[', '\\', ']', '^', '_'
 };
 
-/* ENC is the basic 1 character encoding function to make a char printing.  */
-#define ENC(Char) (trans_ptr[(Char) & 077])
-
-/* Copy from IN to OUT, encoding as you go along. */
-static void encode()
+/*
+ * Encode the string S of length LENGTH to base64 format and place it
+ * to STORE.  STORE will be 0-terminated, and must point to a writable
+ * buffer of at least 1+BASE64_LENGTH(length) bytes.
+ * where BASE64_LENGTH(len) = (4 * ((LENGTH + 2) / 3))
+ */
+static void base64_encode (const char *s, const char *store, const int length, const char *tbl)
 {
-  register int ch, n;
-  char *p = NULL;
-  char buf[80];
-
-  while (1) {
-    n = 0;
-    do {
-      register int m = fread (buf, 1, 45 - n, stdin);
-      if (m == 0)
-        break;
-      n += m;
-    }
-    while (n < 45);
-
-    if (n == 0)
-      break;
-
-    if (trans_ptr == uu_std)
-      if (putchar (ENC (n)) == EOF)
-        break;
-    for (p = buf; n > 2; n -= 3, p += 3) {
-      ch = *p >> 2;
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-      ch = ((*p << 4) & 060) | ((p[1] >> 4) & 017);
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-      ch = ((p[1] << 2) & 074) | ((p[2] >> 6) & 03);
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-      ch = p[2] & 077;
-      ch = ENC (ch);
-      if (putchar (ch) == EOF)
-        break;
-    }
-
-    if (n != 0)
-      break;
-
-    if (putchar ('\n') == EOF)
-      break;
-  }
-
-  while (n != 0) {
-    char c1 = *p;
-    char c2 = n == 1 ? 0 : p[1];
-
-    ch = c1 >> 2;
-    ch = ENC (ch);
-    if (putchar (ch) == EOF)
-      break;
-
-    ch = ((c1 << 4) & 060) | ((c2 >> 4) & 017);
-    ch = ENC (ch);
-    if (putchar (ch) == EOF)
-      break;
-
-    if (n == 1)
-      ch = trans_ptr == uu_std ? ENC ('\0') : '=';
-    else {
-      ch = (c2 << 2) & 074;
-      ch = ENC (ch);
-    }
-    if (putchar (ch) == EOF)
-      break;
-    ch = trans_ptr == uu_std ? ENC ('\0') : '=';
-    if (putchar (ch) == EOF)
-      break;
-    putchar ('\n');
-    break;
-  }
-
-  if (ferror (stdin))
-    error_msg("Read error");
-
-  if (trans_ptr == uu_std) {
-    putchar (ENC ('\0'));
-    putchar ('\n');
-  }
+	int i;
+	unsigned char *p = (unsigned char *)store;
+
+	/* Transform the 3x8 bits to 4x6 bits, as required by base64.  */
+	for (i = 0; i < length; i += 3) {
+		*p++ = tbl[s[0] >> 2];
+		*p++ = tbl[((s[0] & 3) << 4) + (s[1] >> 4)];
+		*p++ = tbl[((s[1] & 0xf) << 2) + (s[2] >> 6)];
+		*p++ = tbl[s[2] & 0x3f];
+		s += 3;
+	}
+	/* Pad the result if necessary...  */
+	if (i == length + 1) {
+		*(p - 1) = '=';
+	}
+	else if (i == length + 2) {
+		*(p - 1) = *(p - 2) = '=';
+	}
+	/* ...and zero-terminate it.  */
+	*p = '\0';
 }
 
-int uuencode_main (int argc,
-                   char **argv)
+int uuencode_main(int argc, char **argv)
 {
-  int opt;
-  struct stat sb;
-  int mode;
-
-  trans_ptr = uu_std;      /* Standard encoding is old uu format */
-
-  /* Parse any options */
-  while ((opt = getopt (argc, argv, "m")) > 0) {
-    switch (opt) {
-     case 'm':
-      trans_ptr = uu_base64;
-      break;
-
-     default:
-      show_usage();
-    }
-  }
-
-  switch (argc - optind) {
-   case 2:
-    /* Optional first argument is input file.  */
-    if (!freopen (argv[optind], "r", stdin) || fstat (fileno (stdin), &sb)) {
-      perror_msg("%s", argv[optind]);
-      return EXIT_FAILURE;
-    }
-    mode = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
-    optind++;
-    break;
-
-   case 1:
-    mode = RW & ~umask (RW);
-    break;
-
-   case 0:
-   default:
-    show_usage();
-  }
-
-  printf("begin%s %o %s\n", trans_ptr == uu_std ? "" : "-base64",
-            mode, argv[optind]);
-  encode();
-  printf(trans_ptr == uu_std ? "end\n" : "====\n");
-  if (ferror (stdout)) {
-    error_msg("Write error");
-    return EXIT_FAILURE;
-  }
-  return EXIT_SUCCESS;
+	const int src_buf_size = BUFSIZ;	// This *MUST* be a multiple of 3
+	const int dst_buf_size = 4 * ((src_buf_size + 2) / 3);
+	RESERVE_BB_BUFFER(src_buf, src_buf_size + 1);
+	RESERVE_BB_BUFFER(dst_buf, dst_buf_size + 1);
+	struct stat stat_buf;
+	FILE *src_stream = stdin;
+	char *tbl = tbl_std;
+	size_t size;
+	mode_t mode;
+	int opt;
+	int column = 0;
+	int write_size;
+	int remaining;
+	int buffer_offset = 0;
+
+	while ((opt = getopt(argc, argv, "m")) != -1) {
+		switch (opt) {
+		case 'm':
+			tbl = tbl_base64;
+   			break;
+		default:
+			show_usage();
+		}
+	}
+
+	switch (argc - optind) {
+		case 2:
+			src_stream = xfopen(argv[optind], "r");
+			stat(argv[optind], &stat_buf);
+			mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+			if (src_stream == stdout) {
+				printf("NULL\n");
+			}
+			break;
+		case 1:
+			mode = umask(0666);
+			break;
+		default:
+			show_usage();
+	}
+
+	printf("begin%s %o %s", tbl == tbl_std ? "" : "-base64", mode, argv[argc - 1]);
+
+	while ((size = fread(src_buf, 1, src_buf_size, src_stream)) > 0) {
+		/* Encode the buffer we just read in */
+		base64_encode(src_buf, dst_buf, size, tbl);
+
+		/* Write the buffer to stdout, wrapping at 60 chars.
+		 * This looks overly complex, but it gets tricky as
+		 * the line has to continue to wrap correctly if we
+		 * have to refill the buffer
+		 *
+		 * Improvments most welcome
+		 */
+
+		/* Initialise values for the new buffer */
+		remaining = 4 * ((size + 2) / 3);
+		buffer_offset = 0;
+		if (remaining > (60 - column)) {
+			write_size = 60 - column;
+		}
+		else if (remaining < 60) {
+			write_size = remaining;
+		} else {
+			write_size = 60;
+		}
+
+		/* Write the buffer to stdout, wrapping at 60 chars
+		 * starting from the column the last buffer ran out
+		 */
+		do {
+			/* Setup a new row if required */
+			if (column == 0) {
+				putchar('\n');
+				if (tbl == tbl_std) {
+					putchar('M');
+				}
+			}
+			/* Write to the 60th column */
+			if (fwrite(&dst_buf[buffer_offset], 1, write_size, stdout) != write_size) {
+				perror("Couldnt finish writing");
+			}
+			/* Update variables based on last write */
+			buffer_offset += write_size;
+			remaining -= write_size;
+			column += write_size;
+			if (column % 60 == 0) {
+				column = 0;
+			}
+
+			/* working next amount to write */
+			write_size = (60 - column) % 60;
+			if (write_size < remaining) {
+				write_size = remaining;
+			}
+			if (write_size == 0) {
+				write_size = 60;
+			}
+		} while (remaining > 0);
+	}
+	printf(tbl == tbl_std ? "\n`\nend\n" : "\n====\n");
+
+	return(EXIT_SUCCESS);
 }
-
-/* Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change 
- *		ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 
- *
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-