case 'd':
debug_setlevel(atoi(optarg));
#ifdef DEBUG
- if (atoi(optarg)<=3 && atoi(optarg)>=0)
+ 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 (0-3).\n"));
+ printf(_("Please specify a valid debugging level ("
+ DEBUG_MIN_LEVEL_S "-" DEBUG_MAX_LEVEL_S ").\n"));
return 1;
}
#else
}
if (subject)
- msg->env->subject = safe_strdup (subject);
+ msg->env->subject = str_dup (subject);
if (includeFile)
infile = includeFile;
if (infile || bodytext) {
if (infile) {
- if (mutt_strcmp ("-", infile) == 0)
+ if (str_cmp ("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
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);
mutt_endwin (NULL);
perror (tempfile);
fclose (fin);
- FREE (&tempfile);
+ mem_free (&tempfile);
exit (1);
}
if (fin)
}
}
- FREE (&bodytext);
+ mem_free (&bodytext);
if (attach) {
LIST *t = attach;
if (option (OPTXTERMSETTITLES))
mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
- FREE (&Context);
+ mem_free (&Context);
}
mutt_endwin (Errorbuf);
}