Sync with FreeBSD; adds base64 support and other options.

OK deraadt@, some man page tweaks from jmc@

3 files changed, 242 insertions, 68 deletions

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);
 }