drop old code.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/init.c b/init.c
index 1e9eaad..522557f 100644 (file)
--- a/init.c
+++ b/init.c
@@ -69,10 +69,6 @@ static const char* CurRCFile = NULL;
 static int CurRCLine = 0;
 
 /* prototypes for checking for special vars */
-static int check_dsn_return (const char* option, unsigned long val,
-                             char* errbuf, ssize_t errlen);
-static int check_dsn_notify (const char* option, unsigned long val,
-                             char* errbuf, ssize_t errlen);
 static int check_history    (const char* option, unsigned long val,
                              char* errbuf, ssize_t errlen);
 /* this checks that numbers are >= 0 */
@@ -92,8 +88,6 @@ static struct {
   int (*check) (const char* option, unsigned long val,
                 char* errbuf, ssize_t errlen);
 } SpecialVars[] = {
-  { "dsn_notify",               check_dsn_notify },
-  { "dsn_return",               check_dsn_return },
 #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
   { "smtp_use_tls",             mutt_libesmtp_check_usetls },
 #endif
@@ -1394,45 +1388,6 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)),
     set_option (OPTREDRAWTREE);
 }
 
-/* check whether value for $dsn_return would be valid */
-static int check_dsn_return (const char* option __attribute__ ((unused)), unsigned long p,
-                             char* errbuf, ssize_t errlen) {
-  char* val = (char*) p;
-  if (val && *val && m_strncmp(val, "hdrs", 4) != 0 &&
-      m_strncmp(val, "full", 4) != 0) {
-    if (errbuf)
-      snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
-    return (0);
-  }
-  return (1);
-}
-
-/* check whether value for $dsn_notify would be valid */
-static int
-check_dsn_notify (const char* option __attribute__ ((unused)),
-                  unsigned long val, char* errbuf, ssize_t errlen)
-{
-    const char *p = (const char*)val;
-
-    while (p && *p) {
-        const char *q = m_strchrnul(p, ',');
-        int len = q - p;
-
-        if (!m_strncmp(p, "never", len)   && !m_strncmp(p, "delay", len)
-        &&  !m_strncmp(p, "failure", len) && !m_strncmp(p, "success", len))
-        {
-            if (errbuf)
-                snprintf(errbuf, errlen, _("'%.*s' is invalid for $%s"),
-                         len, p, "dsn_notify");
-            return 0;
-        }
-
-        p = q + 1;
-    }
-
-    return 1;
-}
-
 static int check_num (const char* option, unsigned long p,
                       char* errbuf, ssize_t errlen) {
   if ((int) p < 0) {

diff --git a/lib-lua/madmutt.cpkg b/lib-lua/madmutt.cpkg
index 5e48a45..610ee92 100644 (file)
--- a/lib-lua/madmutt.cpkg
+++ b/lib-lua/madmutt.cpkg
@@ -119,8 +119,8 @@ static const char *madmutt_pwd(void)
 @package MTransport {
     path_t   sendmail = m_strdup(SENDMAIL " -eom -oi");
 
-    string_t dsn_notify = NULL;
-    string_t dsn_return = NULL;
+    string_t dsn_notify = NULL /* TODO: check it's NULL, hdrs or full */;
+    string_t dsn_return = NULL /* TODO: check it's never, delay, failure, success with ',' */;
 } MTransport;
 
 /* vim:set ft=c: */