Merge branch 'busybox' into merge

1 files changed, 7 insertions, 0 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index 7684ca4e7..daa3ca1d0 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1038,6 +1038,12 @@ static char *encodeString(const char *string)
  */
 static void decodeBase64(char *Data)
 {
+# if ENABLE_BASE64 || ENABLE_UUDECODE
+        /* Call decode_base64() from uuencode.c */
+        char *eptr = Data;
+        decode_base64(&eptr, Data);
+        *eptr = '\0';
+# else
         const unsigned char *in = (const unsigned char *)Data;
         /* The decoded size will be at most 3/4 the size of the encoded */
         unsigned ch = 0;
@@ -1071,6 +1077,7 @@ static void decodeBase64(char *Data)
                 }
         }
         *Data = '\0';
+# endif
 }
 #endif