Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/uudecode.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/uudecode.c (modified) (8 diffs)

branches/2.2.5/mindi-busybox/coreutils/uudecode.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  *  Copyright 2003, Glenn McGrath <bug1@iinet.net.au>
@@ -12 +13 @@
 
 
-#include <stdio.h>
-#include <errno.h>
-#include <getopt.h> /* optind */
-#include <string.h>
-#include <stdlib.h>
-#include "busybox.h"
-
-static int read_stduu(FILE *src_stream, FILE *dst_stream)
+#include "libbb.h"
+
+static void read_stduu(FILE *src_stream, FILE *dst_stream)
 {
     char *line;
 
-    while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
+    while ((line = xmalloc_getline(src_stream)) != NULL) {
         int length;
         char *line_ptr = line;
 
         if (strcmp(line, "end") == 0) {
-            return(EXIT_SUCCESS);
+            return;
         }
         length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3;
@@ -37 +33 @@
         }
         if (length > 60) {
-            bb_error_msg_and_die("Line too long");
+            bb_error_msg_and_die("line too long");
         }
 
         line_ptr++;
-        /* Tolerate an overly long line to acomadate a possible exta '`' */
+        /* Tolerate an overly long line to accomodate a possible exta '`' */
         if (strlen(line_ptr) < (size_t)length) {
-            bb_error_msg_and_die("Short file");
+            bb_error_msg_and_die("short file");
         }
 
@@ -68 +64 @@
         free(line);
     }
-    bb_error_msg_and_die("Short file");
+    bb_error_msg_and_die("short file");
 }
 
-static int read_base64(FILE *src_stream, FILE *dst_stream)
+static void read_base64(FILE *src_stream, FILE *dst_stream)
 {
-    static const char base64_table[] =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n";
-    char term_count = 0;
+    int term_count = 1;
 
     while (1) {
@@ -85 +79 @@
             int ch;
 
-            /* Get next _valid_ character */
+            /* Get next _valid_ character.
+             * global vector bb_uuenc_tbl_base64[] contains this string:
+             * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
+             */
             do {
                 ch = fgetc(src_stream);
                 if (ch == EOF) {
-                    bb_error_msg_and_die("Short file");
+                    bb_error_msg_and_die("short file");
                 }
-            } while ((table_ptr = strchr(base64_table, ch)) == NULL);
-
-            /* Convert encoded charcter to decimal */
-            ch = table_ptr - base64_table;
+                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
+            } while (table_ptr == NULL);
+
+            /* Convert encoded character to decimal */
+            ch = table_ptr - bb_uuenc_tbl_base64;
 
             if (*table_ptr == '=') {
                 if (term_count == 0) {
-                    translated[count] = 0;
+                    translated[count] = '\0';
                     break;
                 }
                 term_count++;
-            }
-            else if (*table_ptr == '\n') {
+            } else if (*table_ptr == '\n') {
                 /* Check for terminating line */
                 if (term_count == 5) {
-                    return(EXIT_SUCCESS);
+                    return;
                 }
                 term_count = 1;
@@ -118 +115 @@
 
         /* Merge 6 bit chars to 8 bit */
-        fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
+        if (count > 1) {
+            fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
+        }
         if (count > 2) {
             fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
@@ -128 +127 @@
 }
 
+int uudecode_main(int argc, char **argv);
 int uudecode_main(int argc, char **argv)
 {
-    int (*decode_fn_ptr) (FILE * src, FILE * dst);
-    FILE *src_stream;
+    FILE *src_stream = stdin;
     char *outname = NULL;
     char *line;
-    int opt;
-
-    opt = bb_getopt_ulflags(argc, argv, "o:", &outname);
-
-    if (optind == argc) {
-        src_stream = stdin;
-    } else if (optind + 1 == argc) {
-        src_stream = bb_xfopen(argv[optind], "r");
-    } else {
-        bb_show_usage();
-    }
+
+    opt_complementary = "?1"; /* 1 argument max */
+    getopt32(argv, "o:", &outname);
+    argv += optind;
+
+    if (argv[0])
+        src_stream = xfopen(argv[0], "r");
 
     /* Search for the start of the encoding */
-    while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
-        char *line_ptr = NULL;
-
-        if (line == NULL) {
-            break;
-        } else if (strncmp(line, "begin-base64 ", 13) == 0) {
+    while ((line = xmalloc_getline(src_stream)) != NULL) {
+        void (*decode_fn_ptr)(FILE * src, FILE * dst);
+        char *line_ptr;
+        FILE *dst_stream;
+        int mode;
+
+        if (strncmp(line, "begin-base64 ", 13) == 0) {
             line_ptr = line + 13;
             decode_fn_ptr = read_base64;
@@ -158 +154 @@
             line_ptr = line + 6;
             decode_fn_ptr = read_stduu;
-        }
-
-        if (line_ptr) {
-            FILE *dst_stream;
-            int mode;
-            int ret;
-
-            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));
-            }
+        } else {
             free(line);
-            ret = decode_fn_ptr(src_stream, dst_stream);
-            bb_fclose_nonstdin(src_stream);
-            return(ret);
+            continue;
+        }
+
+        /* begin line found. decode and exit */
+        mode = strtoul(line_ptr, NULL, 8);
+        if (outname == NULL) {
+            outname = strchr(line_ptr, ' ');
+            if ((outname == NULL) || (*outname == '\0')) {
+                break;
+            }
+            outname++;
+        }
+        dst_stream = stdout;
+        if (NOT_LONE_DASH(outname)) {
+            dst_stream = xfopen(outname, "w");
+            chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO));
         }
         free(line);
+        decode_fn_ptr(src_stream, dst_stream);
+        /* fclose_if_not_stdin(src_stream); - redundant */
+        return EXIT_SUCCESS;
     }
-    bb_error_msg_and_die("No `begin' line");
+    bb_error_msg_and_die("no 'begin' line");
 }
+
+/* Test script.
+Put this into an empty dir with busybox binary, an run.
+
+#!/bin/sh
+test -x busybox || { echo "No ./busybox?"; exit; }
+ln -sf busybox uudecode
+ln -sf busybox uuencode
+>A_null
+echo -n A >A
+echo -n AB >AB
+echo -n ABC >ABC
+echo -n ABCD >ABCD
+echo -n ABCDE >ABCDE
+echo -n ABCDEF >ABCDEF
+cat busybox >A_bbox
+for f in A*; do
+    echo uuencode $f
+    ./uuencode    $f <$f >u_$f
+    ./uuencode -m $f <$f >m_$f
+done
+mkdir unpk_u unpk_m 2>/dev/null
+for f in u_*; do
+    ./uudecode <$f -o unpk_u/${f:2}
+    diff -a ${f:2} unpk_u/${f:2} >/dev/null 2>&1
+    echo uudecode $f: $?
+done
+for f in m_*; do
+    ./uudecode <$f -o unpk_m/${f:2}
+    diff -a ${f:2} unpk_m/${f:2} >/dev/null 2>&1
+    echo uudecode $f: $?
+done
+*/