Date: Wed, 3 Nov 2010 10:10:34 +0000 (UTC) From: Edwin Groothuis <edwin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r214729 - stable/8/usr.bin/uudecode Message-ID: <201011031010.oA3AAYjl015348@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: edwin Date: Wed Nov 3 10:10:34 2010 New Revision: 214729 URL: http://svn.freebsd.org/changeset/base/214729 Log: MFC of r214002, r214010 - Stylify of uudecode(1) Part of PR bin/124739. - "b64decode -r" did not handle arbitary breaks in base64 encoded data. White space should be accepted anywhere in a base64 encoded stream, not just after every chunk (4 characters). Test-scenario: VmVsb2NpdHkgUmV3YXJkcw== and VmVsb2NpdHkgUmV3YXJkcw == should both produce "Velocity Rewards" PR: bin/124739 Submitted by: Mark Andrews <marka@isc.org> Modified: stable/8/usr.bin/uudecode/uudecode.c Directory Properties: stable/8/usr.bin/uudecode/ (props changed) Modified: stable/8/usr.bin/uudecode/uudecode.c ============================================================================== --- stable/8/usr.bin/uudecode/uudecode.c Wed Nov 3 09:23:08 2010 (r214728) +++ stable/8/usr.bin/uudecode/uudecode.c Wed Nov 3 10:10:34 2010 (r214729) @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> +#include <ctype.h> #include <err.h> #include <errno.h> #include <fcntl.h> @@ -87,7 +88,7 @@ main(int argc, char *argv[]) base64 = 1; while ((ch = getopt(argc, argv, "cimo:prs")) != -1) { - switch(ch) { + switch (ch) { case 'c': if (oflag || rflag) usage(); @@ -125,10 +126,10 @@ main(int argc, char *argv[]) usage(); } } - argc -= optind; - argv += optind; + argc -= optind; + argv += optind; - if (*argv) { + if (*argv != NULL) { rval = 0; do { infp = fopen(infile = *argv, "r"); @@ -184,7 +185,7 @@ decode2(void) void *handle; struct passwd *pw; struct stat st; - char buf[MAXPATHLEN+1]; + char buf[MAXPATHLEN + 1]; base64 = 0; /* search for header line */ @@ -259,7 +260,7 @@ decode2(void) if (pflag || strcmp(outfile, "/dev/stdout") == 0) outfp = stdout; else { - flags = O_WRONLY|O_CREAT|O_EXCL; + flags = O_WRONLY | O_CREAT | O_EXCL; if (lstat(outfile, &st) == 0) { if (iflag) { warnc(EEXIST, "%s: %s", infile, outfile); @@ -305,6 +306,7 @@ decode2(void) static int getline(char *buf, size_t size) { + if (fgets(buf, size, infp) != NULL) return (2); if (rflag) @@ -341,17 +343,19 @@ uu_decode(void) /* for each input line */ for (;;) { switch (getline(buf, sizeof(buf))) { - case 0: return (0); - case 1: return (1); + 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 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); \ + return (1); \ } while (0) /* @@ -364,8 +368,8 @@ uu_decode(void) 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; + IS_DEC(*(p + 2)) && IS_DEC(*(p + 3)))) + OUT_OF_RANGE; ch = DEC(p[0]) << 2 | DEC(p[1]) >> 4; putc(ch, outfp); @@ -373,8 +377,7 @@ uu_decode(void) putc(ch, outfp); ch = DEC(p[2]) << 6 | DEC(p[3]); putc(ch, outfp); - } - else { + } else { if (i >= 1) { if (!(IS_DEC(*p) && IS_DEC(*(p + 1)))) OUT_OF_RANGE; @@ -383,56 +386,85 @@ uu_decode(void) } if (i >= 2) { if (!(IS_DEC(*(p + 1)) && - IS_DEC(*(p + 2)))) - OUT_OF_RANGE; + IS_DEC(*(p + 2)))) + OUT_OF_RANGE; ch = DEC(p[1]) << 4 | DEC(p[2]) >> 2; putc(ch, outfp); } if (i >= 3) { if (!(IS_DEC(*(p + 2)) && - IS_DEC(*(p + 3)))) - OUT_OF_RANGE; + IS_DEC(*(p + 3)))) + OUT_OF_RANGE; ch = DEC(p[2]) << 6 | DEC(p[3]); putc(ch, outfp); } } } switch (getline(buf, sizeof(buf))) { - case 0: return (0); - case 1: return (1); - default: return (checkend(buf, "end", "no \"end\" line")); + 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+1]; + int n, count, count4; + char inbuf[MAXPATHLEN + 1], *p; unsigned char outbuf[MAXPATHLEN * 4]; + char leftover[MAXPATHLEN + 1]; + leftover[0] = '\0'; for (;;) { - switch (getline(inbuf, sizeof(inbuf))) { - case 0: return (0); - case 1: return (1); + strcpy(inbuf, leftover); + switch (getline(inbuf + strlen(inbuf), + sizeof(inbuf) - strlen(inbuf))) { + case 0: + return (0); + case 1: + return (1); } + + count = 0; + count4 = -1; + p = inbuf; + while (*p != '\0') { + /* + * Base64 encoded strings have the following + * characters in them: A-Z, a-z, 0-9 and +, / and = + */ + if (isalnum(*p) || *p == '+' || *p == '/' || *p == '=') + count++; + if (count % 4 == 0) + count4 = p - inbuf; + p++; + } + + strcpy(leftover, inbuf + count4 + 1); + inbuf[count4 + 1] = 0; + n = b64_pton(inbuf, outbuf, sizeof(outbuf)); + if (n < 0) break; fwrite(outbuf, 1, n, outfp); } - return (checkend(inbuf, "====", - "error decoding base64 input stream")); + return (checkend(inbuf, "====", "error decoding base64 input stream")); } static void usage(void) { + (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"); + "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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011031010.oA3AAYjl015348>