#include "url.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
+#include "xterm.h"
#include "lib/mem.h"
#include "lib/intl.h"
("usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
+ muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n\
muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
muttng -v[v]\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");
+#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\
-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\
int version = 0;
int i;
int explicit_folder = 0;
- long sek;
+ int dump_variables = 0;
extern char *optarg;
extern int optind;
/* initialize random number for tmp file creation */
- time (&sek);
- srand (sek);
+ srand ((unsigned int) time (NULL));
/* sanity check against stupid administrators */
#ifdef USE_NNTP
while ((i =
getopt (argc, argv,
- "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF)
+ "A:a:b:F:f:c:Dd:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF)
#else
while ((i =
- getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
+ getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
#endif
switch (i) {
case 'A':
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
break;
+ case 'D':
+ dump_variables = 1;
+ break;
+
case 'e':
commands = mutt_add_list (commands, optarg);
break;
}
/* Check for a batch send. */
- if (!isatty (0) || queries || alias_queries) {
+ if (!isatty (0) || queries || alias_queries || dump_variables) {
set_option (OPTNOCURSES);
sendflags = SENDBATCH;
}
if (queries)
return mutt_query_variables (queries);
+ if (dump_variables)
+ return (mutt_dump_variables ());
if (alias_queries) {
int rv = 0;
}
if (subject)
- msg->env->subject = safe_strdup (subject);
+ msg->env->subject = str_dup (subject);
if (includeFile)
infile = includeFile;
if (infile || bodytext) {
if (infile) {
- if (safe_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;
M_READONLY : 0, NULL))
|| !explicit_folder) {
mutt_index_menu ();
+ if (option (OPTXTERMSETTITLES))
+ mutt_xterm_set_title (NONULL (XtermLeave));
if (Context)
- FREE (&Context);
+ mem_free (&Context);
}
mutt_endwin (Errorbuf);
}