Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/mailutils/popmaildir.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/mailutils/popmaildir.c (modified) (3 diffs)

branches/3.2/mindi-busybox/mailutils/popmaildir.c

@@ -10 +10 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//kbuild:lib-$(CONFIG_POPMAILDIR) += popmaildir.o mail.o
+
+//usage:#define popmaildir_trivial_usage
+//usage:       "[OPTIONS] MAILDIR [CONN_HELPER ARGS]"
+//usage:#define popmaildir_full_usage "\n\n"
+//usage:       "Fetch content of remote mailbox to local maildir\n"
+/* //usage:  "\n    -b      Binary mode. Ignored" */
+/* //usage:  "\n    -d      Debug. Ignored" */
+/* //usage:  "\n    -m      Show used memory. Ignored" */
+/* //usage:  "\n    -V      Show version. Ignored" */
+/* //usage:  "\n    -c      Use tcpclient. Ignored" */
+/* //usage:  "\n    -a      Use APOP protocol. Implied. If server supports APOP -> use it" */
+//usage:     "\n    -s      Skip authorization"
+//usage:     "\n    -T      Get messages with TOP instead of RETR"
+//usage:     "\n    -k      Keep retrieved messages on the server"
+//usage:     "\n    -t SEC      Network timeout"
+//usage:    IF_FEATURE_POPMAILDIR_DELIVERY(
+//usage:     "\n    -F \"PROG ARGS\"    Filter program (may be repeated)"
+//usage:     "\n    -M \"PROG ARGS\"    Delivery program"
+//usage:    )
+//usage:     "\n"
+//usage:     "\nFetch from plain POP3 server:"
+//usage:     "\npopmaildir -k DIR nc pop3.server.com 110 <user_and_pass.txt"
+//usage:     "\nFetch from SSLed POP3 server and delete fetched emails:"
+//usage:     "\npopmaildir DIR -- openssl s_client -quiet -connect pop3.server.com:995 <user_and_pass.txt"
+/* //usage:  "\n    -R BYTES    Remove old messages on the server >= BYTES. Ignored" */
+/* //usage:  "\n    -Z N1-N2    Remove messages from N1 to N2 (dangerous). Ignored" */
+/* //usage:  "\n    -L BYTES    Don't retrieve new messages >= BYTES. Ignored" */
+/* //usage:  "\n    -H LINES    Type first LINES of a message. Ignored" */
+//usage:
+//usage:#define popmaildir_example_usage
+//usage:       "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n"
+//usage:       "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
+
 #include "libbb.h"
 #include "mail.h"
@@ -15 +50 @@
 static void pop3_checkr(const char *fmt, const char *param, char **ret)
 {
-    const char *msg = command(fmt, param);
+    char *msg = send_mail_command(fmt, param);
     char *answer = xmalloc_fgetline(stdin);
     if (answer && '+' == answer[0]) {
+        free(msg);
         if (timeout)
             alarm(0);
@@ -28 +64 @@
         return;
     }
-    bb_error_msg_and_die("%s failed: %s", msg, answer);
+    bb_error_msg_and_die("%s failed, reply was: %s", msg, answer);
 }