Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/uuencode.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/uuencode.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/uuencode.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Copyright 2006 Rob Landley <rob@landley.net>
+ * Copyright 2003, Glenn McGrath
+ * Copyright 2006, Rob Landley <rob@landley.net>
+ * Copyright 2010, Denys Vlasenko
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -40 +42 @@
  * where BASE64_LENGTH(len) = (4 * ((LENGTH + 2) / 3))
  */
-void bb_uuencode(char *p, const void *src, int length, const char *tbl)
+void FAST_FUNC bb_uuencode(char *p, const void *src, int length, const char *tbl)
 {
     const unsigned char *s = src;
@@ -70 +72 @@
     }
 }
+
+/*
+ * Decode base64 encoded stream.
+ * Can stop on EOF, specified char, or on uuencode-style "====" line:
+ * flags argument controls it.
+ */
+void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags)
+{
+/* Note that EOF _can_ be passed as exit_char too */
+#define exit_char    ((int)(signed char)flags)
+#define uu_style_end (flags & BASE64_FLAG_UU_STOP)
+
+    int term_count = 0;
+
+    while (1) {
+        unsigned char translated[4];
+        int count = 0;
+
+        /* Process one group of 4 chars */
+        while (count < 4) {
+            char *table_ptr;
+            int ch;
+
+            /* Get next _valid_ character.
+             * bb_uuenc_tbl_base64[] contains this string:
+             *  0         1         2         3         4         5         6
+             *  012345678901234567890123456789012345678901234567890123456789012345
+             * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
+             */
+            do {
+                ch = fgetc(src_stream);
+                if (ch == exit_char && count == 0)
+                    return;
+                if (ch == EOF)
+                    bb_error_msg_and_die("truncated base64 input");
+                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
+//TODO: add BASE64_FLAG_foo to die on bad char?
+//Note that then we may need to still allow '\r' (for mail processing)
+            } while (!table_ptr);
+
+            /* Convert encoded character to decimal */
+            ch = table_ptr - bb_uuenc_tbl_base64;
+
+            if (ch == 65 /* '\n' */) {
+                /* Terminating "====" line? */
+                if (uu_style_end && term_count == 4)
+                    return; /* yes */
+                term_count = 0;
+                continue;
+            }
+            /* ch is 64 if char was '=', otherwise 0..63 */
+            translated[count] = ch & 63; /* 64 -> 0 */
+            if (ch == 64) {
+                term_count++;
+                break;
+            }
+            count++;
+            term_count = 0;
+        }
+
+        /* Merge 6 bit chars to 8 bit.
+         * count can be < 4 when we decode the tail:
+         * "eQ==" -> "y", not "y NUL NUL"
+         */
+        if (count > 1)
+            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);
+    } /* while (1) */
+}