X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=9a667acf2adde06f7016e7f519c22aaa5cb1ee0b;hp=cee557dd12f22ecf24312fd3eaa1b5fc2dcb4f05;hb=b1f82c20e0e18fd6f87c677b2dd091350935f883;hpb=e83ad1be25aefea3ed21ec08edbaf2d5a72c4a9d

diff --git a/main.c b/main.c
index cee557d..9a667ac 100644
--- a/main.c
+++ b/main.c
@@ -120,7 +120,11 @@ options:\n\
   -a <file>\tattach a file to the message\n\
   -b <address>\tspecify a blind carbon-copy (BCC) address\n\
   -c <address>\tspecify a carbon-copy (CC) address\n\
-  -D\t\tprint the value of all variables to stdout\n\
+  -D\t\tprint the value of all variables to stdout");
+#if DEBUG
+  puts _("  -d <level>\tlog debugging output to ~/.muttngdebug0");
+#endif
+  puts _("\
   -e <command>\tspecify a command to be executed after initialization\n\
   -f <file>\tspecify which mailbox to read\n\
   -F <file>\tspecify an alternate muttrc file\n\
@@ -128,6 +132,7 @@ options:\n\
   -G\t\tselect a newsgroup (if compiled with NNTP)\n\
   -H <file>\tspecify a draft file to read header and body from\n\
   -i <file>\tspecify a file which Mutt-ng should include in the body\n\
+  -d <level>\t specify debugging level of Mutt-ng\n\
   -m <type>\tspecify a default mailbox type\n\
   -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
   -p\t\trecall a postponed message\n\
@@ -580,7 +585,13 @@ int main (int argc, char **argv)
     case 'd':
       debug_setlevel(atoi(optarg));
 #ifdef DEBUG
-      printf (_("Debugging at level %d.\n"), atoi(optarg));
+      if (atoi(optarg) <= DEBUG_MAX_LEVEL && atoi(optarg) >= DEBUG_MIN_LEVEL)
+        printf (_("Debugging at level %d.\n"), atoi(optarg));
+      else {
+        printf(_("Please specify a valid debugging level ("
+                 DEBUG_MIN_LEVEL_S "-" DEBUG_MAX_LEVEL_S ").\n"));
+        return 1;
+      }
 #else
       printf _("DEBUG was not defined during compilation.  Ignored.\n");
 #endif
@@ -792,7 +803,7 @@ int main (int argc, char **argv)
       }
 
       if (subject)
-        msg->env->subject = safe_strdup (subject);
+        msg->env->subject = str_dup (subject);
 
       if (includeFile)
         infile = includeFile;
@@ -800,7 +811,7 @@ int main (int argc, char **argv)
 
     if (infile || bodytext) {
       if (infile) {
-        if (mutt_strcmp ("-", infile) == 0)
+        if (str_cmp ("-", infile) == 0)
           fin = stdin;
         else {
           char path[_POSIX_PATH_MAX];
@@ -819,7 +830,7 @@ int main (int argc, char **argv)
         fin = NULL;
 
       mutt_mktemp (buf);
-      tempfile = safe_strdup (buf);
+      tempfile = str_dup (buf);
 
       if (draftFile)
         msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
@@ -834,7 +845,7 @@ int main (int argc, char **argv)
             mutt_endwin (NULL);
           perror (tempfile);
           fclose (fin);
-          FREE (&tempfile);
+          mem_free (&tempfile);
           exit (1);
         }
         if (fin)
@@ -847,7 +858,7 @@ int main (int argc, char **argv)
       }
     }
 
-    FREE (&bodytext);
+    mem_free (&bodytext);
 
     if (attach) {
       LIST *t = attach;
@@ -949,7 +960,7 @@ int main (int argc, char **argv)
       if (option (OPTXTERMSETTITLES))
         mutt_xterm_set_title (NONULL (XtermLeave));
       if (Context)
-        FREE (&Context);
+        mem_free (&Context);
     }
     mutt_endwin (Errorbuf);
   }