Sync with FreeBSD; adds base64 support and other options.

OK deraadt@, some man page tweaks from jmc@

5 files changed, 575 insertions, 158 deletions

diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 171815d7811..4f6401b4e72 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:51:39 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2004/04/09 22:54:02 millert Exp $
 
 PROG=	uudecode
+LINKS=	${BINDIR}/uudecode ${BINDIR}/b64decode
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 4c3d09055e0..11b26076ca0 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: uudecode.c,v 1.13 2003/12/09 01:31:42 mickey Exp $	*/
-/*	$NetBSD: uudecode.c,v 1.6 1994/11/17 07:40:43 jtc Exp $	*/
+/*	$OpenBSD: uudecode.c,v 1.14 2004/04/09 22:54:02 millert Exp $	*/
+/*	$FreeBSD: uudecode.c,v 1.49 2003/05/03 19:44:46 obrien Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1993
@@ -30,176 +30,418 @@
  * SUCH DAMAGE.
  */
 
-char copyright[] =
+#ifndef lint
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif
-static char rcsid[] = "$OpenBSD: uudecode.c,v 1.13 2003/12/09 01:31:42 mickey Exp $";
+static const char rcsid[] = "$OpenBSD: uudecode.c,v 1.14 2004/04/09 22:54:02 millert Exp $";
 #endif /* not lint */
 
 /*
- * uudecode [-p] [file ...]
- *
- * create the specified file, decoding as you go.
- * used with uuencode.
- *
- * Write to stdout if '-p' is specified.  Use this option if you care about
- * security at all.
+ * Create the specified file, decoding as you go.
+ * Used with uuencode.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-#include <errno.h>
+
 #include <sys/param.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
 
+#include <netinet/in.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <locale.h>
 #include <pwd.h>
+#include <resolv.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <err.h>
 
-static int decode(int);
-static void usage(void);
-char *filename;
+static const char *infile, *outfile;
+static FILE *infp, *outfp;
+static int base64, cflag, iflag, oflag, pflag, rflag, sflag;
+
+static void	usage(void);
+static int	decode(void);
+static int	decode2(void);
+static int	uu_decode(void);
+static int	base64_decode(void);
 
 int
 main(int argc, char *argv[])
 {
-	int rval;
-	int ch;
-	int tostdout = 0;
+	int rval, ch;
+	extern char *__progname;
 
-	setlocale(LC_ALL, "");
+	if (strcmp(__progname, "b64decode") == 0)
+		base64 = 1;
 
-	while ((ch = getopt(argc, argv, "p")) != -1)
-		switch((char)ch) {
+	setlocale(LC_ALL, "");
+	while ((ch = getopt(argc, argv, "cimo:prs")) != -1) {
+		switch(ch) {
+		case 'c':
+			if (oflag || rflag)
+				usage();
+			cflag = 1; /* multiple uudecode'd files */
+			break;
+		case 'i':
+			iflag = 1; /* ask before override files */
+			break;
+		case 'm':
+			base64 = 1;
+			break;
+		case 'o':
+			if (cflag || pflag || rflag || sflag)
+				usage();
+			oflag = 1; /* output to the specified file */
+			sflag = 1; /* do not strip pathnames for output */
+			outfile = optarg; /* set the output filename */
+			break;
 		case 'p':
-			tostdout++;
+			if (oflag)
+				usage();
+			pflag = 1; /* print output to stdout */
+			break;
+		case 'r':
+			if (cflag || oflag)
+				usage();
+			rflag = 1; /* decode raw data */
+			break;
+		case 's':
+			if (oflag)
+				usage();
+			sflag = 1; /* do not strip pathnames for output */
 			break;
-		case '?':
 		default:
 			usage();
 		}
+	}
 	argc -= optind;
 	argv += optind;
 
 	if (*argv) {
 		rval = 0;
 		do {
-			if (!freopen(filename = *argv, "r", stdin)) {
+			infp = fopen(infile = *argv, "r");
+			if (infp == NULL) {
 				warn("%s", *argv);
 				rval = 1;
 				continue;
 			}
-			rval |= decode(tostdout);
+			rval |= decode();
+			fclose(infp);
 		} while (*++argv);
 	} else {
-		filename = "stdin";
-		rval = decode(tostdout);
+		infile = "stdin";
+		infp = stdin;
+		rval = decode();
 	}
 	exit(rval);
 }
 
 static int
-decode(int tostdout)
+decode(void)
 {
+	int r, v;
+
+	if (rflag) {
+		/* relaxed alternative to decode2() */
+		outfile = "/dev/stdout";
+		outfp = stdout;
+		if (base64)
+			return (base64_decode());
+		else
+			return (uu_decode());
+	}
+	v = decode2();
+	if (v == EOF) {
+		warnx("%s: missing or bad \"begin\" line", infile);
+		return (1);
+	}
+	for (r = v; cflag; r |= v) {
+		v = decode2();
+		if (v == EOF)
+			break;
+	}
+	return (r);
+}
+
+static int
+decode2(void)
+{
+	int flags, fd, mode;
+	size_t n, m;
+	char *p, *q;
+	void *handle;
 	struct passwd *pw;
-	int n;
-	char ch, *p;
-	int mode, n1;
+	struct stat st;
 	char buf[MAXPATHLEN];
 
+	base64 = 0;
 	/* search for header line */
-	do {
-		if (!fgets(buf, sizeof(buf), stdin)) {
-			warnx("%s: no \"begin\" line", filename);
-			return(1);
+	for (;;) {
+		if (fgets(buf, sizeof(buf), infp) == NULL)
+			return (EOF);
+		p = buf;
+		if (strncmp(p, "begin-base64 ", 13) == 0) {
+			base64 = 1;
+			p += 13;
+		} else if (strncmp(p, "begin ", 6) == 0)
+			p += 6;
+		else
+			continue;
+		/* p points to mode */
+		q = strchr(p, ' ');
+		if (q == NULL)
+			continue;
+		*q++ = '\0';
+		/* q points to filename */
+		n = strlen(q);
+		while (n > 0 && (q[n-1] == '\n' || q[n-1] == '\r'))
+			q[--n] = '\0';
+		/* found valid header? */
+		if (n > 0)
+			break;
+	}
+
+	handle = setmode(p);
+	if (handle == NULL) {
+		warnx("%s: unable to parse file mode", infile);
+		return (1);
+	}
+	mode = getmode(handle, 0) & 0666;
+	free(handle);
+
+	if (sflag) {
+		/* don't strip, so try ~user/file expansion */
+		p = NULL;
+		pw = NULL;
+		if (*q == '~')
+			p = strchr(q, '/');
+		if (p != NULL) {
+			*p = '\0';
+			pw = getpwnam(q + 1);
+			*p = '/';
 		}
-	} while (strncmp(buf, "begin ", 6));
-	(void)sscanf(buf, "begin %o %1023[^\n\r]", &mode, buf);
-
-	/* handle ~user/file format */
-	if (buf[0] == '~') {
-		if (!(p = strchr(buf, '/'))) {
-			warnx("%s: illegal ~user", filename);
-			return(1);
+		if (pw != NULL) {
+			n = strlen(pw->pw_dir);
+			if (buf + n > p) {
+				/* make room */
+				m = strlen(p);
+				if (sizeof(buf) < n + m) {
+					warnx("%s: bad output filename",
+					    infile);
+					return (1);
+				}
+				p = memmove(buf + n, p, m);
+			}
+			q = memcpy(p - n, pw->pw_dir, n);
 		}
-		*p++ = NULL;
-		if (!(pw = getpwnam(buf + 1))) {
-			warnx("%s: no user %s", filename, buf);
-			return(1);
+	} else {
+		/* strip down to leaf name */
+		p = strrchr(q, '/');
+		if (p != NULL)
+			q = p + 1;
+	}
+	if (!oflag)
+		outfile = q;
+
+	/* POSIX says "/dev/stdout" is a 'magic cookie' not a special file. */
+	if (pflag || strcmp(outfile, "/dev/stdout") == 0)
+		outfp = stdout;
+	else {
+		flags = O_WRONLY|O_CREAT|O_EXCL|O_NOFOLLOW;
+		if (lstat(outfile, &st) == 0) {
+			if (iflag) {
+				errno = EEXIST;
+				warn("%s: %s", infile, outfile);
+				return (0);
+			}
+			switch (st.st_mode & S_IFMT) {
+			case S_IFREG:
+			case S_IFLNK:
+				/* avoid symlink attacks */
+				if (unlink(outfile) == 0 || errno == ENOENT)
+					break;
+				warn("%s: unlink %s", infile, outfile);
+				return (1);
+			case S_IFDIR:
+				errno = EISDIR;
+				warn("%s: %s", infile, outfile);
+				return (1);
+			default:
+				if (oflag) {
+					/* trust command-line names */
+					flags &= ~(O_EXCL|O_NOFOLLOW);
+					break;
+				}
+				errno = EEXIST;
+				warn("%s: %s", infile, outfile);
+				return (1);
+			}
+		} else if (errno != ENOENT) {
+			warn("%s: %s", infile, outfile);
+			return (1);
 		}
-		n = strlen(pw->pw_dir);
-		n1 = strlen(p);
-		if (n + n1 + 2 > MAXPATHLEN) {
-			warnx("%s: path too long", filename);
-			return(1);
+		if ((fd = open(outfile, flags, mode)) < 0 ||
+		    (outfp = fdopen(fd, "w")) == NULL) {
+			warn("%s: %s", infile, outfile);
+			return (1);
 		}
-		bcopy(p, buf + n + 1, n1 + 1);
-		bcopy(pw->pw_dir, buf, n);
-		buf[n] = '/';
 	}
 
-	if (!tostdout) {
-		/* create output file, set mode */
-		if (!freopen(buf, "w", stdout) ||
-		    fchmod(fileno(stdout), mode&0666)) {
-			warn("%s: %s", buf, filename);
-			return(1);
-		}
+	if (base64)
+		return (base64_decode());
+	else
+		return (uu_decode());
+}
+
+static int
+getline(char *buf, size_t size)
+{
+	if (fgets(buf, size, infp) != NULL)
+		return (2);
+	if (rflag)
+		return (0);
+	warnx("%s: %s: short file", infile, outfile);
+	return (1);
+}
+
+static int
+checkend(const char *ptr, const char *end, const char *msg)
+{
+	size_t n;
+
+	n = strlen(end);
+	if (strncmp(ptr, end, n) != 0 ||
+	    strspn(ptr + n, " \t\r\n") != strlen(ptr + n)) {
+		warnx("%s: %s: %s", infile, outfile, msg);
+		return (1);
+	}
+	if (fclose(outfp) != 0) {
+		warn("%s: %s", infile, outfile);
+		return (1);
 	}
+	return (0);
+}
+
+static int
+uu_decode(void)
+{
+	int i, ch;
+	char *p;
+	char buf[MAXPATHLEN];
 
 	/* for each input line */
 	for (;;) {
-		if (!fgets(p = buf, sizeof(buf), stdin)) {
-			warnx("%s: short file", filename);
-			return(1);
+		switch (getline(buf, sizeof(buf))) {
+		case 0:
+			return (0);
+		case 1:
+			return (1);
 		}
+
 #define	DEC(c)	(((c) - ' ') & 077)		/* single character decode */
+#define IS_DEC(c) ( (((c) - ' ') >= 0) && (((c) - ' ') <= 077 + 1) )
+
+#define OUT_OF_RANGE do {						\
+	warnx("%s: %s: character out of range: [%d-%d]",		\
+	    infile, outfile, 1 + ' ', 077 + ' ' + 1);			\
+	return (1);							\
+} while (0)
+
 		/*
-		 * `n' is used to avoid writing out all the characters
+		 * `i' is used to avoid writing out all the characters
 		 * at the end of the file.
 		 */
-		if ((n = DEC(*p)) <= 0)
+		p = buf;
+		if ((i = DEC(*p)) <= 0)
 			break;
-		for (++p; n > 0; p += 4, n -= 3)
-			if (n >= 3) {
+		for (++p; i > 0; p += 4, i -= 3)
+			if (i >= 3) {
+				if (!(IS_DEC(*p) && IS_DEC(*(p + 1)) &&
+				     IS_DEC(*(p + 2)) && IS_DEC(*(p + 3))))
+					OUT_OF_RANGE;
+
 				ch = DEC(p[0]) << 2 | DEC(p[1]) >> 4;
-				putchar(ch);
+				putc(ch, outfp);
 				ch = DEC(p[1]) << 4 | DEC(p[2]) >> 2;
-				putchar(ch);
+				putc(ch, outfp);
 				ch = DEC(p[2]) << 6 | DEC(p[3]);
-				putchar(ch);
+				putc(ch, outfp);
 			}
 			else {
-				if (n >= 1) {
+				if (i >= 1) {
+					if (!(IS_DEC(*p) && IS_DEC(*(p + 1))))
+						OUT_OF_RANGE;
 					ch = DEC(p[0]) << 2 | DEC(p[1]) >> 4;
-					putchar(ch);
+					putc(ch, outfp);
 				}
-				if (n >= 2) {
+				if (i >= 2) {
+					if (!(IS_DEC(*(p + 1)) &&
+					    IS_DEC(*(p + 2))))
+						OUT_OF_RANGE;
+
 					ch = DEC(p[1]) << 4 | DEC(p[2]) >> 2;
-					putchar(ch);
+					putc(ch, outfp);
 				}
-				if (n >= 3) {
+				if (i >= 3) {
+					if (!(IS_DEC(*(p + 2)) &&
+					    IS_DEC(*(p + 3))))
+						OUT_OF_RANGE;
 					ch = DEC(p[2]) << 6 | DEC(p[3]);
-					putchar(ch);
+					putc(ch, outfp);
 				}
 			}
 	}
-	if (!fgets(buf, sizeof(buf), stdin) || strcmp(buf, "end\n")) {
-		warnx("%s: no \"end\" line", filename);
-		return(1);
+	switch (getline(buf, sizeof(buf))) {
+	case 0:
+		return (0);
+	case 1:
+		return (1);
+	default:
+		return (checkend(buf, "end", "no \"end\" line"));
+	}
+}
+
+static int
+base64_decode(void)
+{
+	int n;
+	char inbuf[MAXPATHLEN];
+	unsigned char outbuf[MAXPATHLEN * 4];
+
+	for (;;) {
+		switch (getline(inbuf, sizeof(inbuf))) {
+		case 0:
+			return (0);
+		case 1:
+			return (1);
+		}
+		n = b64_pton(inbuf, outbuf, sizeof(outbuf));
+		if (n < 0)
+			break;
+		fwrite(outbuf, 1, n, outfp);
 	}
-	return(0);
+	return (checkend(inbuf, "====",
+		    "error decoding base64 input stream"));
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: uudecode [-p] [file ...]\n");
+	(void)fprintf(stderr,
+	    "usage: uudecode [-cimprs] [file ...]\n"
+	    "       uudecode [-i] -o output_file [file]\n"
+	    "       b64decode [-cimprs] [file ...]\n"
+	    "       b64decode [-i] -o output_file [file]\n");
 	exit(1);
 }
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index c79e802b8a5..5aef3053e09 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,7 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:51:40 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2004/04/09 22:54:02 millert Exp $
 
 PROG=	uuencode
 MAN=	uuencode.1 uuencode.5
-MLINKS=	uuencode.1 uudecode.1
+LINKS=	${BINDIR}/uuencode ${BINDIR}/b64encode
+MLINKS= uuencode.1 uudecode.1 \
+	uuencode.1 b64encode.1 \
+	uuencode.1 b64decode.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 27099ae667e..2b9923a7bbe 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: uuencode.1,v 1.13 2003/06/03 02:56:21 millert Exp $
-.\"	$NetBSD: uuencode.1,v 1.4 1994/11/17 07:39:42 jtc Exp $
+.\"	$OpenBSD: uuencode.1,v 1.14 2004/04/09 22:54:02 millert Exp $
+.\"	$FreeBSD: uuencode.1,v 1.26 2003/03/18 14:24:47 fanf Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,35 +29,67 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
+.\" $FreeBSD$
 .\"
-.Dd June 6, 1993
+.Dd January 27, 2002
 .Dt UUENCODE 1
 .Os
 .Sh NAME
 .Nm uuencode ,
-.Nm uudecode
+.Nm uudecode ,
+.Nm b64encode ,
+.Nm b64decode
 .Nd encode/decode a binary file
 .Sh SYNOPSIS
 .Nm uuencode
+.Op Fl m
+.Op Fl o Ar output_file
 .Op Ar file
 .Ar name
 .Nm uudecode
-.Op Fl p
-.Op Ar file ...
+.Op Fl cimprs
+.Op Ar
+.Nm uudecode
+.Op Fl i
+.Fl o Ar output_file
+.Nm b64encode
+.Op Fl o Ar output_file
+.Op Ar file
+.Ar name
+.Nm b64decode
+.Op Fl ciprs
+.Op Ar
+.Nm b64decode
+.Op Fl i
+.Fl o Ar output_file
+.Op Ar file
 .Sh DESCRIPTION
+The
 .Nm uuencode
 and
 .Nm uudecode
-are used to transmit binary files over transmission mediums
+utilities are used to transmit binary files over transmission mediums
 that do not support formats other than printable
 .Tn ASCII
 data.
+.Nm b64encode
+and
+.Nm b64decode
+are equivalent to running
+.Nm uuencode
+and
+.Nm uudecode
+respectively with the
+.Fl m
+flag specified.
 .Pp
 .Nm uuencode
 reads
 .Ar file
 (or by default, the standard input) and writes an encoded version
-to the standard output.
+to the standard output, or to
+.Ar output_file
+if it has been specified.
 The encoding uses only printing
 .Tn ASCII
 characters and includes the
@@ -70,15 +102,74 @@ for use by
 transforms
 .Dq uuencoded
 files (or by default, the standard input) into the original form.
-The resulting file is named
+The resulting file is named either
 .Ar name
+or (depending on options passed to
+.Nm uudecode )
+.Ar output_file
 and will have the mode of the original file except that set-user-ID
 and execute bits are not retained.
-If the
-.Fl p
-option is specified, the output will instead be written to stdout.
 .Nm uudecode
 ignores any leading and trailing lines.
+.Pp
+The options for
+.Nm uuencode
+are as follows:
+.Bl -tag -width ident
+.It Fl m
+Use the Base64 method of encoding, rather than the traditional
+.Nm
+algorithm.
+.It Fl o Ar output_file
+Output to
+.Ar output_file
+instead of standard output.
+.El
+.Pp
+The options for
+.Nm uudecode
+are as follows:
+.Bl -tag -width ident
+.It Fl c
+Decode more than one uuencoded file from
+.Ar file
+if possible.
+.It Fl i
+Do not overwrite files.
+.It Fl m
+When used with the
+.Fl r
+flag, decode Base64 input instead of traditional
+.Nm
+input.
+Without
+.Fl r
+it has no effect.
+.It Fl o Ar output_file
+Output to
+.Ar output_file
+instead of any pathname contained in the input data.
+.It Fl p
+Decode
+.Ar file
+and write output to standard output.
+.It Fl r
+Decode raw (or broken) input which is missing the initial and
+possibly the final framing lines.
+The input is assumed to be in the traditional
+.Nm
+encoding, but if the
+.Fl m
+flag is used, or if the utility is invoked as
+.Nm b64decode ,
+then the input is assumed to be in Base64 format.
+.It Fl s
+Do not strip output pathname to base filename.
+By default
+.Nm uudecode
+deletes any prefix ending with the last slash '/' for security
+reasons.
+.El
 .Sh EXAMPLES
 The following example packages up a source tree, compresses it,
 uuencodes it and mails it to a user on another system.
@@ -88,16 +179,27 @@ is run on the target system, the file
 .Pa src_tree.tar.Z
 will be created which may then be uncompressed and extracted
 into the original tree.
+.Bd -literal -offset indent
+$ tar cf - src_tree | compress | \e
+uuencode src_tree.tar.Z | mail user@example.com
+.Ed
 .Pp
-.Bd -literal -offset indent -compact
-$ tar cf \- src_tree \&| compress \&| \\
-uuencode src_tree.tar.Z \&| mail user@example.com
+The following example unpacks all uuencoded
+files from your mailbox into your current working directory.
+.Bd -literal -offset indent
+$ uudecode -c \*(Lt $MAIL
 .Ed
 .Pp
-Both utilities exit 0 on success or >0 if an error occurred.
+The following example extracts a compressed tar
+archive from your mailbox
+.Bd -literal -offset indent
+$ uudecode -o /dev/stdout \*(Gt $MAIL | zcat | tar xfv -
+.Ed
 .Sh SEE ALSO
+.Xr basename 1 ,
 .Xr compress 1 ,
 .Xr mail 1 ,
+.Xr uucp 1 ,
 .Xr uuencode 5
 .Sh STANDARDS
 The
@@ -110,9 +212,9 @@ utilities conform to
 The
 .Nm uudecode
 and
-.Nm uuencode
+.Nm
 utilities appeared in
 .Bx 4.0 .
 .Sh BUGS
-The encoded form of the file is expanded by 35% (3 bytes become 4 plus
-control information).
+Files encoded using the traditional algorithm are expanded by 35%
+(3 bytes become 4 plus control information).
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 1579708b367..4bedc535796 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: uuencode.c,v 1.6 2003/06/10 22:20:53 deraadt Exp $	*/
-/*	$NetBSD: uuencode.c,v 1.7 1994/11/17 07:41:15 jtc Exp $	*/
+/*	$OpenBSD: uuencode.c,v 1.7 2004/04/09 22:54:02 millert Exp $	*/
+/*	$FreeBSD: uuencode.c,v 1.18 2004/01/22 07:23:35 grehan Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1993
@@ -30,54 +30,81 @@
  * SUCH DAMAGE.
  */
 
-char copyright[] =
+#ifndef lint
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif
-static char rcsid[] = "$OpenBSD: uuencode.c,v 1.6 2003/06/10 22:20:53 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: uuencode.c,v 1.7 2004/04/09 22:54:02 millert Exp $";
 #endif /* not lint */
 
 /*
- * uuencode [input] output
- *
  * Encode a file so it can be mailed to a remote system.
  */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+#include <netinet/in.h>
+
+#include <err.h>
+#include <locale.h>
+#include <resolv.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <locale.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
-static void encode(void);
-static __dead void usage(void);
+void encode(void);
+void base64_encode(void);
+static void usage(void);
+
+FILE *output;
+int mode;
+char **av;
 
 int
 main(int argc, char *argv[])
 {
 	struct stat sb;
-	int mode;
+	int base64;
+	int ch;
+	char *outfile;
+	extern char *__progname;
 
-	setlocale(LC_ALL, "");
+	base64 = 0;
+	outfile = NULL;
 
-	while (getopt(argc, argv, "") != -1)
-		usage();
+	if (strcmp(__progname, "b64encode") == 0)
+		base64 = 1;
+
+	setlocale(LC_ALL, "");
+	while ((ch = getopt(argc, argv, "mo:")) != -1) {
+		switch (ch) {
+		case 'm':
+			base64 = 1;
+			break;
+		case 'o':
+			outfile = optarg;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	}
 	argv += optind;
 	argc -= optind;
 
 	switch(argc) {
 	case 2:			/* optional first argument is input file */
-		if (!freopen(*argv, "r", stdin) || fstat(fileno(stdin), &sb)) {
-			(void)fprintf(stderr, "uuencode: %s: %s.\n",
-			    *argv, strerror(errno));
-			exit(1);
-		}
+		if (!freopen(*argv, "r", stdin) || fstat(fileno(stdin), &sb))
+			err(1, "%s", *argv);
 #define	RWX	(S_IRWXU|S_IRWXG|S_IRWXO)
 		mode = sb.st_mode & RWX;
 		++argv;
@@ -91,13 +118,20 @@ main(int argc, char *argv[])
 		usage();
 	}
 
-	(void)printf("begin %o %s\n", mode, *argv);
-	encode();
-	(void)printf("end\n");
-	if (ferror(stdout)) {
-		(void)fprintf(stderr, "uuencode: write error.\n");
-		exit(1);
-	}
+	av = argv;
+
+	if (outfile != NULL) {
+		output = fopen(outfile, "w+");
+		if (output == NULL)
+			err(1, "unable to open %s for output", outfile);
+	} else
+		output = stdout;
+	if (base64)
+		base64_encode();
+	else
+		encode();
+	if (ferror(output))
+		errx(1, "write error");
 	exit(0);
 }
 
@@ -105,52 +139,87 @@ main(int argc, char *argv[])
 #define	ENC(c) ((c) ? ((c) & 077) + ' ': '`')
 
 /*
- * copy from in to out, encoding as you go along.
+ * Copy from in to out, encoding in base64 as you go along.
  */
-static void
+void
+base64_encode(void)
+{
+	/*
+	 * 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;
+
+	sequence = 0;
+
+	fprintf(output, "begin-base64 %o %s\n", mode, *av);
+	while ((n = fread(buf, 1, sizeof(buf), stdin))) {
+		++sequence;
+		rv = b64_ntop(buf, n, buf2, (sizeof(buf2) / sizeof(buf2[0])));
+		if (rv == -1)
+			errx(1, "b64_ntop: error encoding base64");
+		fprintf(output, "%s%s", buf2, (sequence % GROUPS) ? "" : "\n");
+	}
+	if (sequence % GROUPS)
+		fprintf(output, "\n");
+	fprintf(output, "====\n");
+}
+
+/*
+ * Copy from in to out, encoding as you go along.
+ */
+void
 encode(void)
 {
 	int ch, n;
 	char *p;
 	char buf[80];
 
+	(void)fprintf(output, "begin %o %s\n", mode, *av);
 	while ((n = fread(buf, 1, 45, stdin))) {
 		ch = ENC(n);
-		if (putchar(ch) == EOF)
+		if (fputc(ch, output) == EOF)
 			break;
 		for (p = buf; n > 0; n -= 3, p += 3) {
+			/* Pad with nulls if not a multiple of 3. */
+			if (n < 3) {
+				p[2] = '\0';
+				if (n < 2)
+					p[1] = '\0';
+			}
 			ch = *p >> 2;
 			ch = ENC(ch);
-			if (putchar(ch) == EOF)
+			if (fputc(ch, output) == EOF)
 				break;
-			ch = (*p << 4) & 060 | (p[1] >> 4) & 017;
+			ch = ((*p << 4) & 060) | ((p[1] >> 4) & 017);
 			ch = ENC(ch);
-			if (putchar(ch) == EOF)
+			if (fputc(ch, output) == EOF)
 				break;
-			ch = (p[1] << 2) & 074 | (p[2] >> 6) & 03;
+			ch = ((p[1] << 2) & 074) | ((p[2] >> 6) & 03);
 			ch = ENC(ch);
-			if (putchar(ch) == EOF)
+			if (fputc(ch, output) == EOF)
 				break;
 			ch = p[2] & 077;
 			ch = ENC(ch);
-			if (putchar(ch) == EOF)
+			if (fputc(ch, output) == EOF)
 				break;
 		}
-		if (putchar('\n') == EOF)
+		if (fputc('\n', output) == EOF)
 			break;
 	}
-	if (ferror(stdin)) {
-		(void)fprintf(stderr, "uuencode: read error.\n");
-		exit(1);
-	}
-	ch = ENC('\0');
-	(void)putchar(ch);
-	(void)putchar('\n');
+	if (ferror(stdin))
+		errx(1, "read error");
+	(void)fprintf(output, "%c\nend\n", ENC('\0'));
 }
 
 static void
 usage(void)
 {
-	(void)fprintf(stderr,"usage: uuencode [infile] remotefile\n");
+	(void)fprintf(stderr,
+	    "usage: uuencode [-m] [-o outfile] [infile] remotefile\n"
+	    "       b64encode [-o outfile] [infile] remotefile\n");
 	exit(1);
 }