[BusyBox-cvs] busybox/coreutils uudecode.c,1.20,1.21
Glenn McGrath
bug1 at busybox.net
Thu Nov 6 03:17:26 UTC 2003
Update of /var/cvs/busybox/coreutils
In directory winder:/tmp/cvs-serv16499/coreutils
Modified Files:
uudecode.c
Log Message:
Rewrite, 800+ bytes smaller and more robust.
Index: uudecode.c
===================================================================
RCS file: /var/cvs/busybox/coreutils/uudecode.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- uudecode.c 19 Mar 2003 09:11:34 -0000 1.20
+++ uudecode.c 6 Nov 2003 03:17:23 -0000 1.21
@@ -1,353 +1,201 @@
-/* uudecode.c -- uudecode utility.
- * Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+/*
+ * GPLv2
+ * Copyright 2003, Glenn McGrath <bug1 at optushome.com.au>
*
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation; either version 2 of the License.
*
- * 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 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.
*
- * 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.
+ * 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 at airs.com, August 93.
+ * Based on specification from
+ * http://www.opengroup.org/onlinepubs/007904975/utilities/uuencode.html
*
- * Original copyright notice is retained at the end of this file.
+ * Bugs: the spec doesnt mention anything about "`\n`\n" prior to the "end" line
*/
-
#include <stdio.h>
#include <errno.h>
#include <getopt.h>
#include <string.h>
#include <stdlib.h>
-#include "busybox.h"
-#include "pwd_.h"
-#include "grp_.h"
-
-/*struct passwd *getpwnam();*/
-/* Single character decode. */
-#define DEC(Char) (((Char) - ' ') & 077)
+#include "libbb.h"
-static int read_stduu (const char *inname)
+static int read_stduu(FILE *src_stream, FILE *dst_stream)
{
- char buf[2 * BUFSIZ];
+ char *line;
- while (1) {
- int n;
- char *p;
+ while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
+ int length;
+ char *line_ptr = line;
- if (fgets (buf, sizeof(buf), stdin) == NULL) {
- bb_error_msg("%s: Short file", inname);
- return FALSE;
- }
- p = buf;
+ if (strcmp(line, "end") == 0) {
+ return(EXIT_SUCCESS);
+ }
+ length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3;
- /* N is used to avoid writing out all the characters at the end of
- the file. */
- n = DEC (*p);
- if (n <= 0)
- break;
- for (++p; n > 0; p += 4, n -= 3) {
- char ch;
+ if (length <= 0) {
+ /* Ignore the "`\n" line, why is it even in the encode file ? */
+ continue;
+ }
+ if (length > 60) {
+ bb_error_msg_and_die("Line too long");
+ }
+
+ line_ptr++;
+ /* Tolerate an overly long line to acomadate a possible exta '`' */
+ if (strlen(line_ptr) < length) {
+ bb_error_msg_and_die("Short file");
+ }
- if (n >= 3) {
- ch = DEC (p[0]) << 2 | DEC (p[1]) >> 4;
- putchar (ch);
- ch = DEC (p[1]) << 4 | DEC (p[2]) >> 2;
- putchar (ch);
- ch = DEC (p[2]) << 6 | DEC (p[3]);
- putchar (ch);
- } else {
- if (n >= 1) {
- ch = DEC (p[0]) << 2 | DEC (p[1]) >> 4;
- putchar (ch);
- }
- if (n >= 2) {
- ch = DEC (p[1]) << 4 | DEC (p[2]) >> 2;
- putchar (ch);
- }
- }
- }
- }
+ while (length > 0) {
+ /* Merge four 6 bit chars to three 8 bit chars */
+ fputc(((line_ptr[0] - 0x20) & 077) << 2 | ((line_ptr[1] - 0x20) & 077) >> 4, dst_stream);
+ line_ptr++;
+ length--;
+ if (length == 0) {
+ break;
+ }
- if (fgets (buf, sizeof(buf), stdin) == NULL
- || strcmp (buf, "end\n")) {
- bb_error_msg("%s: No `end' line", inname);
- return FALSE;
- }
+ fputc(((line_ptr[0] - 0x20) & 077) << 4 | ((line_ptr[1] - 0x20) & 077) >> 2, dst_stream);
+ line_ptr++;
+ length--;
+ if (length == 0) {
+ break;
+ }
- return TRUE;
+ fputc(((line_ptr[0] - 0x20) & 077) << 6 | ((line_ptr[1] - 0x20) & 077), dst_stream);
+ line_ptr += 2;
+ length -= 2;
+ }
+ free(line);
+ }
+ bb_error_msg_and_die("Short file");
}
-static int read_base64 (const char *inname)
+static int read_base64(FILE *src_stream, FILE *dst_stream)
{
- static const char b64_tab[256] = {
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*000-007*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*010-017*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*020-027*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*030-037*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*040-047*/
- '\177', '\177', '\177', '\76', '\177', '\177', '\177', '\77', /*050-057*/
- '\64', '\65', '\66', '\67', '\70', '\71', '\72', '\73', /*060-067*/
- '\74', '\75', '\177', '\177', '\177', '\100', '\177', '\177', /*070-077*/
- '\177', '\0', '\1', '\2', '\3', '\4', '\5', '\6', /*100-107*/
- '\7', '\10', '\11', '\12', '\13', '\14', '\15', '\16', /*110-117*/
- '\17', '\20', '\21', '\22', '\23', '\24', '\25', '\26', /*120-127*/
- '\27', '\30', '\31', '\177', '\177', '\177', '\177', '\177', /*130-137*/
- '\177', '\32', '\33', '\34', '\35', '\36', '\37', '\40', /*140-147*/
- '\41', '\42', '\43', '\44', '\45', '\46', '\47', '\50', /*150-157*/
- '\51', '\52', '\53', '\54', '\55', '\56', '\57', '\60', /*160-167*/
- '\61', '\62', '\63', '\177', '\177', '\177', '\177', '\177', /*170-177*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*200-207*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*210-217*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*220-227*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*230-237*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*240-247*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*250-257*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*260-267*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*270-277*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*300-307*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*310-317*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*320-327*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*330-337*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*340-347*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*350-357*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*360-367*/
- '\177', '\177', '\177', '\177', '\177', '\177', '\177', '\177', /*370-377*/
- };
- unsigned char buf[2 * BUFSIZ];
-
- while (1) {
- int last_data = 0;
- unsigned char *p;
-
- if (fgets (buf, sizeof(buf), stdin) == NULL) {
- bb_error_msg("%s: Short file", inname);
- return FALSE;
- }
- p = buf;
-
- if (memcmp (buf, "====", 4) == 0)
- break;
- if (last_data != 0) {
- bb_error_msg("%s: data following `=' padding character", inname);
- return FALSE;
- }
+ const char *base64_table =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n";
+ char term_count = 0;
- /* The following implementation of the base64 decoding might look
- a bit clumsy but I only try to follow the POSIX standard:
- ``All line breaks or other characters not found in the table
- [with base64 characters] shall be ignored by decoding
- software.'' */
- while (*p != '\n') {
- char c1, c2, c3;
+ while (1) {
+ char translated[4];
+ int count = 0;
- while ((b64_tab[*p] & '\100') != 0)
- if (*p == '\n' || *p++ == '=')
- break;
- if (*p == '\n')
- /* This leaves the loop. */
- continue;
- c1 = b64_tab[*p++];
+ while (count < 4) {
+ char *table_ptr;
+ char ch;
- while ((b64_tab[*p] & '\100') != 0)
- if (*p == '\n' || *p++ == '=') {
- bb_error_msg("%s: illegal line", inname);
- return FALSE;
- }
- c2 = b64_tab[*p++];
+ /* Get next _valid_ character */
+ do {
+ ch = fgetc(src_stream);
+ if (ch == EOF) {
+ bb_error_msg_and_die("Short file");
+ }
+ } while ((table_ptr = strchr(base64_table, ch)) == NULL);
- while (b64_tab[*p] == '\177')
- if (*p++ == '\n') {
- bb_error_msg("%s: illegal line", inname);
- return FALSE;
- }
- if (*p == '=') {
- putchar (c1 << 2 | c2 >> 4);
- last_data = 1;
- break;
- }
- c3 = b64_tab[*p++];
+ /* Convert encoded charcter to decimal */
+ ch = table_ptr - base64_table;
- while (b64_tab[*p] == '\177')
- if (*p++ == '\n') {
- bb_error_msg("%s: illegal line", inname);
- return FALSE;
- }
- putchar (c1 << 2 | c2 >> 4);
- putchar (c2 << 4 | c3 >> 2);
- if (*p == '=') {
- last_data = 1;
- break;
- }
- else
- putchar (c3 << 6 | b64_tab[*p++]);
- }
- }
+ if (*table_ptr == '=') {
+ if (term_count == 0) {
+ translated[count] = 0;
+ break;
+ }
+ term_count++;
+ }
+ else if (*table_ptr == '\n') {
+ /* Check for terminating line */
+ if (term_count == 5) {
+ return(EXIT_SUCCESS);
+ }
+ term_count = 1;
+ continue;
+ } else {
+ translated[count] = ch;
+ count++;
+ term_count = 0;
+ }
+ }
- return TRUE;
+ /* Merge 6 bit chars to 8 bit */
+ fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
+ if (count > 2) {
+ fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
+ }
+ if (count > 3) {
+ fputc(translated[2] << 6 | translated[3], dst_stream);
+ }
+ }
}
-static int decode (const char *inname,
- const char *forced_outname)
+extern int uudecode_main(int argc, char **argv)
{
- struct passwd *pw;
- register char *p;
- int mode;
- char buf[2 * BUFSIZ];
- char *outname;
- int do_base64 = 0;
- int res;
- int dofre;
-
- /* Search for header line. */
-
- while (1) {
- if (fgets (buf, sizeof (buf), stdin) == NULL) {
- bb_error_msg("%s: No `begin' line", inname);
- return FALSE;
- }
-
- if (strncmp (buf, "begin", 5) == 0) {
- if (sscanf (buf, "begin-base64 %o %s", &mode, buf) == 2) {
- do_base64 = 1;
- break;
- } else if (sscanf (buf, "begin %o %s", &mode, buf) == 2)
- break;
- }
- }
-
- /* If the output file name is given on the command line this rules. */
- dofre = FALSE;
- if (forced_outname != NULL)
- outname = (char *) forced_outname;
- else {
- /* Handle ~user/file format. */
- if (buf[0] != '~')
- outname = buf;
- else {
- p = buf + 1;
- while (*p != '/')
- ++p;
- if (*p == '\0') {
- bb_error_msg("%s: Illegal ~user", inname);
- return FALSE;
- }
- *p++ = '\0';
- pw = getpwnam (buf + 1);
- if (pw == NULL) {
- bb_error_msg("%s: No user `%s'", inname, buf + 1);
- return FALSE;
- }
- outname = concat_path_file(pw->pw_dir, p);
- dofre = TRUE;
- }
- }
-
- /* Create output file and set mode. */
- if (strcmp (outname, "/dev/stdout") != 0 && strcmp (outname, "-") != 0
- && (freopen (outname, "w", stdout) == NULL
- || chmod (outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO))
- )) {
- bb_perror_msg("%s", outname); /* */
- if (dofre)
- free(outname);
- return FALSE;
- }
-
- /* We differenciate decoding standard UU encoding and base64. A
- common function would only slow down the program. */
+ int (*decode_fn_ptr) (FILE * src, FILE * dst);
+ FILE *src_stream;
+ char *outname = NULL;
+ char *line;
+ int opt;
- /* For each input line: */
- if (do_base64)
- res = read_base64 (inname);
- else
- res = read_stduu (inname);
- if (dofre)
- free(outname);
- return res;
-}
+ opt = bb_getopt_ulflags(argc, argv, "o:", &outname);
-int uudecode_main (int argc,
- char **argv)
-{
- int opt;
- int exit_status;
- const char *outname;
- outname = NULL;
+ if (optind == argc) {
+ src_stream = stdin;
+ } else if (optind + 1 == argc) {
+ src_stream = bb_xfopen(argv[optind], "r");
+ } else {
+ bb_show_usage();
+ }
- while ((opt = getopt(argc, argv, "o:")) != EOF) {
- switch (opt) {
- case 0:
- break;
+ /* Search for the start of the encoding */
+ while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
+ char *line_ptr = NULL;
- case 'o':
- outname = optarg;
- break;
+ if (line == NULL) {
+ break;
+ } else if (strncmp(line, "begin-base64 ", 13) == 0) {
+ line_ptr = line + 13;
+ decode_fn_ptr = read_base64;
+ } else if (strncmp(line, "begin ", 6) == 0) {
+ line_ptr = line + 6;
+ decode_fn_ptr = read_stduu;
+ }
- default:
- bb_show_usage();
- }
- }
+ if (line_ptr) {
+ FILE *dst_stream;
+ int mode;
+ int ret;
- if (optind == argc)
- exit_status = decode ("stdin", outname) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- else {
- exit_status = EXIT_SUCCESS;
- do {
- if (freopen (argv[optind], "r", stdin) != NULL) {
- if (decode (argv[optind], outname) != 0)
- exit_status = FALSE;
- } else {
- bb_perror_msg("%s", argv[optind]);
- exit_status = EXIT_FAILURE;
- }
- optind++;
- }
- while (optind < argc);
- }
- return(exit_status);
+ mode = strtoul(line_ptr, NULL, 8);
+ if (outname == NULL) {
+ outname = strchr(line_ptr, ' ');
+ if ((outname == NULL) || (*outname == '\0')) {
+ break;
+ }
+ outname++;
+ }
+ if (strcmp(outname, "-") == 0) {
+ dst_stream = stdout;
+ } else {
+ dst_stream = bb_xfopen(outname, "w");
+ chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO));
+ }
+ free(line);
+ ret = decode_fn_ptr(src_stream, dst_stream);
+ bb_fclose_nonstdin(src_stream);
+ return(ret);
+ }
+ free(line);
+ }
+ bb_error_msg_and_die("No `begin' line");
}
-
-/* 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.
- */
-
-
More information about the busybox-cvs
mailing list