===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uuencode/uuencode.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/uuencode/uuencode.c	2003/06/10 22:20:53	1.6
--- src/usr.bin/uuencode/uuencode.c	2004/04/09 22:54:02	1.7
***************
*** 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 $	*/
  
  /*-
   * Copyright (c) 1983, 1993
--- 1,5 ----
! /*	$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,83 ****
   * SUCH DAMAGE.
   */
  
! char copyright[] =
  "@(#) Copyright (c) 1983, 1993\n\
  	The Regents of the University of California.  All rights reserved.\n";
  
  #ifndef lint
  #if 0
! static 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 $";
  #endif /* not lint */
  
  /*
-  * uuencode [input] output
-  *
   * Encode a file so it can be mailed to a remote system.
   */
  #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);
  
  int
  main(int argc, char *argv[])
  {
  	struct stat sb;
! 	int mode;
  
! 	setlocale(LC_ALL, "");
  
! 	while (getopt(argc, argv, "") != -1)
! 		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);
! 		}
  #define	RWX	(S_IRWXU|S_IRWXG|S_IRWXO)
  		mode = sb.st_mode & RWX;
  		++argv;
--- 30,110 ----
   * SUCH DAMAGE.
   */
  
! #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 const char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
  #endif
! static const char rcsid[] = "$OpenBSD: uuencode.c,v 1.7 2004/04/09 22:54:02 millert Exp $";
  #endif /* not lint */
  
  /*
   * 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 <unistd.h>
  
! 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 base64;
! 	int ch;
! 	char *outfile;
! 	extern char *__progname;
  
! 	base64 = 0;
! 	outfile = NULL;
  
! 	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))
! 			err(1, "%s", *argv);
  #define	RWX	(S_IRWXU|S_IRWXG|S_IRWXO)
  		mode = sb.st_mode & RWX;
  		++argv;
***************
*** 91,103 ****
  		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);
! 	}
  	exit(0);
  }
  
--- 118,137 ----
  		usage();
  	}
  
! 	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,156 ****
  #define	ENC(c) ((c) ? ((c) & 077) + ' ': '`')
  
  /*
!  * copy from in to out, encoding as you go along.
   */
! static void
  encode(void)
  {
  	int ch, n;
  	char *p;
  	char buf[80];
  
  	while ((n = fread(buf, 1, 45, stdin))) {
  		ch = ENC(n);
! 		if (putchar(ch) == EOF)
  			break;
  		for (p = buf; n > 0; 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 (putchar('\n') == EOF)
  			break;
  	}
! 	if (ferror(stdin)) {
! 		(void)fprintf(stderr, "uuencode: read error.\n");
! 		exit(1);
! 	}
! 	ch = ENC('\0');
! 	(void)putchar(ch);
! 	(void)putchar('\n');
  }
  
  static void
  usage(void)
  {
! 	(void)fprintf(stderr,"usage: uuencode [infile] remotefile\n");
  	exit(1);
  }
--- 139,225 ----
  #define	ENC(c) ((c) ? ((c) & 077) + ' ': '`')
  
  /*
!  * Copy from in to out, encoding in base64 as you go along.
   */
! 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 (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 (fputc(ch, output) == EOF)
  				break;
! 			ch = ((*p << 4) & 060) | ((p[1] >> 4) & 017);
  			ch = ENC(ch);
! 			if (fputc(ch, output) == EOF)
  				break;
! 			ch = ((p[1] << 2) & 074) | ((p[2] >> 6) & 03);
  			ch = ENC(ch);
! 			if (fputc(ch, output) == EOF)
  				break;
  			ch = p[2] & 077;
  			ch = ENC(ch);
! 			if (fputc(ch, output) == EOF)
  				break;
  		}
! 		if (fputc('\n', output) == EOF)
  			break;
  	}
! 	if (ferror(stdin))
! 		errx(1, "read error");
! 	(void)fprintf(output, "%c\nend\n", ENC('\0'));
  }
  
  static void
  usage(void)
  {
! 	(void)fprintf(stderr,
! 	    "usage: uuencode [-m] [-o outfile] [infile] remotefile\n"
! 	    "       b64encode [-o outfile] [infile] remotefile\n");
  	exit(1);
  }