tar: support -T - and -X -

[oweals/busybox.git] / mailutils / mail.c

diff --git a/mailutils/mail.c b/mailutils/mail.c
index 89db66166130e975c381e33f6bfe6a696c345dfd..44957016feb94d979d4fdb0257b1092112cef46e 100644 (file)
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -75,13 +75,16 @@ void FAST_FUNC launch_helper(const char **argv)
        atexit(kill_helper);
 }
 
-const FAST_FUNC char *command(const char *fmt, const char *param)
+char* FAST_FUNC send_mail_command(const char *fmt, const char *param)
 {
-       const char *msg = fmt;
+       char *msg;
        if (timeout)
                alarm(timeout);
-       if (msg) {
+       msg = (char*)fmt;
+       if (fmt) {
                msg = xasprintf(fmt, param);
+               if (verbose)
+                       bb_error_msg("send:'%s'", msg);
                printf("%s\r\n", msg);
        }
        fflush_all();
@@ -90,7 +93,7 @@ const FAST_FUNC char *command(const char *fmt, const char *param)
 
 // NB: parse_url can modify url[] (despite const), but only if '@' is there
 /*
-static char FAST_FUNC *parse_url(char *url, char **user, char **pass)
+static char* FAST_FUNC parse_url(char *url, char **user, char **pass)
 {
        // parse [user[:pass]@]host
        // return host
@@ -116,16 +119,15 @@ void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol)
                SRC_BUF_SIZE = 45,  /* This *MUST* be a multiple of 3 */
                DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
        };
-
 #define src_buf text
+       char src[SRC_BUF_SIZE];
        FILE *fp = fp;
        ssize_t len = len;
        char dst_buf[DST_BUF_SIZE + 1];
 
        if (fname) {
                fp = (NOT_LONE_DASH(fname)) ? xfopen_for_read(fname) : (FILE *)text;
-               src_buf = bb_common_bufsiz1;
-       // N.B. strlen(NULL) segfaults!
+               src_buf = src;
        } else if (text) {
                // though we do not call uuencode(NULL, NULL) explicitly
                // still we do not want to break things suddenly