diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-06-22 15:14:44 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-06-22 15:14:44 +0300 |
commit | 4ba3d95fe9bd9bb3b93be60a8ea89e381c5f88c0 (patch) | |
tree | 9b6a3550bafa355ad27234953b143e21839db721 | |
parent | 590669a524a5ee838e1a5056b1fcf6f48b059cbd (diff) | |
download | mailutils-4ba3d95fe9bd9bb3b93be60a8ea89e381c5f88c0.tar.gz mailutils-4ba3d95fe9bd9bb3b93be60a8ea89e381c5f88c0.tar.bz2 |
Use defines for internal mail variable names
-rw-r--r-- | mail/alias.c | 2 | ||||
-rw-r--r-- | mail/decode.c | 9 | ||||
-rw-r--r-- | mail/delete.c | 2 | ||||
-rw-r--r-- | mail/escape.c | 12 | ||||
-rw-r--r-- | mail/file.c | 2 | ||||
-rw-r--r-- | mail/folders.c | 2 | ||||
-rw-r--r-- | mail/from.c | 7 | ||||
-rw-r--r-- | mail/if.c | 2 | ||||
-rw-r--r-- | mail/mail.c | 24 | ||||
-rw-r--r-- | mail/mail.h | 77 | ||||
-rw-r--r-- | mail/mailline.c | 2 | ||||
-rw-r--r-- | mail/mailvar.c | 158 | ||||
-rw-r--r-- | mail/pipe.c | 4 | ||||
-rw-r--r-- | mail/print.c | 4 | ||||
-rw-r--r-- | mail/quit.c | 15 | ||||
-rw-r--r-- | mail/reply.c | 6 | ||||
-rw-r--r-- | mail/send.c | 58 | ||||
-rw-r--r-- | mail/shell.c | 7 | ||||
-rw-r--r-- | mail/top.c | 2 | ||||
-rw-r--r-- | mail/util.c | 36 |
20 files changed, 264 insertions, 167 deletions
diff --git a/mail/alias.c b/mail/alias.c index e46cc9d30..b695ef627 100644 --- a/mail/alias.c +++ b/mail/alias.c @@ -149,3 +149,3 @@ alias_expand (const char *name) - if (mailvar_is_true ("recursivealiases")) + if (mailvar_is_true (mailvar_name_recursivealiases)) { diff --git a/mail/decode.c b/mail/decode.c index 15cfd09a5..869fe2f3b 100644 --- a/mail/decode.c +++ b/mail/decode.c @@ -246,3 +246,3 @@ display_submessage (struct mime_descend_closure *closure, void *data) - if (mailvar_get (&tmp, "metamail", mailvar_type_string, 0) == 0) + if (mailvar_get (&tmp, mailvar_name_metamail, mailvar_type_string, 0) == 0) { @@ -282,3 +282,3 @@ display_submessage (struct mime_descend_closure *closure, void *data) support */ - if (mailvar_is_true ("metamail")) + if (mailvar_is_true (mailvar_name_metamail)) { @@ -286,3 +286,3 @@ display_submessage (struct mime_descend_closure *closure, void *data) - mailvar_get (&no_ask, "mimenoask", mailvar_type_string, 0); + mailvar_get (&no_ask, mailvar_name_mimenoask, mailvar_type_string, 0); builtin_display = display_stream_mailcap (NULL, stream, hdr, no_ask, @@ -402,3 +402,4 @@ run_metamail (const char *mailcap_cmd, mu_message_t mesg) setenv ("METAMAIL_PAGER", getenv ("PAGER"), 0); - if (mailvar_get (&no_ask, "mimenoask", mailvar_type_string, 0)) + if (mailvar_get (&no_ask, mailvar_name_mimenoask, + mailvar_type_string, 0)) setenv ("MM_NOASK", no_ask, 1); diff --git a/mail/delete.c b/mail/delete.c index 1f2192f2d..344857246 100644 --- a/mail/delete.c +++ b/mail/delete.c @@ -39,3 +39,3 @@ mail_delete (int argc, char **argv) - if (mailvar_is_true ("autoprint")) + if (mailvar_is_true (mailvar_name_autoprint)) util_do_command("print"); diff --git a/mail/escape.c b/mail/escape.c index 4dffcd521..bb0f7f09d 100644 --- a/mail/escape.c +++ b/mail/escape.c @@ -71,3 +71,3 @@ escape_check_args (int argc, char **argv, int minargs, int maxargs) minargs--; - mailvar_get (&escape, "escape", mailvar_type_string, 0); + mailvar_get (&escape, mailvar_name_escape, mailvar_type_string, 0); mu_error (ngettext ("%c%s requires at least %d argument", @@ -80,3 +80,3 @@ escape_check_args (int argc, char **argv, int minargs, int maxargs) maxargs--; - mailvar_get (&escape, "escape", mailvar_type_string, 0); + mailvar_get (&escape, mailvar_name_escape, mailvar_type_string, 0); mu_error (ngettext ("%c%s accepts at most %d argument", @@ -146,3 +146,5 @@ escape_sign (int argc MU_ARG_UNUSED, char **argv, compose_env_t *env) - if (mailvar_get (&p, mu_isupper (argv[0][0]) ? "Sign" : "sign", + if (mailvar_get (&p, + mu_isupper (argv[0][0]) + ? mailvar_name_Sign : mailvar_name_sign, mailvar_type_string, 1) == 0) @@ -274,3 +276,3 @@ escape_run_editor (char *ed, int argc, char **argv, compose_env_t *env) mu_stream_seek (env->compstr, 0, MU_SEEK_SET, NULL); - if (mailvar_is_true ("editheaders")) + if (mailvar_is_true (mailvar_name_editheaders)) { @@ -409,3 +411,3 @@ quote0 (msgset_t *mspec, mu_message_t mesg, void *data) - mailvar_get (&prefix, "indentprefix", mailvar_type_string, 0); + mailvar_get (&prefix, mailvar_name_indentprefix, mailvar_type_string, 0); diff --git a/mail/file.c b/mail/file.c index 98efaca92..d7bd41bf6 100644 --- a/mail/file.c +++ b/mail/file.c @@ -143,3 +143,3 @@ mail_file (int argc, char **argv) set_cursor (1); - if (mailvar_is_true ("header")) + if (mailvar_is_true (mailvar_name_header)) { diff --git a/mail/folders.c b/mail/folders.c index 98ca45c26..271eb5676 100644 --- a/mail/folders.c +++ b/mail/folders.c @@ -27,3 +27,3 @@ mail_folders (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED) - if (mailvar_get (&path, "folder", mailvar_type_string, 1)) + if (mailvar_get (&path, mailvar_name_folder, mailvar_type_string, 1)) return 1; diff --git a/mail/from.c b/mail/from.c index a9ee08f94..607d4f03f 100644 --- a/mail/from.c +++ b/mail/from.c @@ -195,3 +195,3 @@ hdr_date (struct header_call_args *args, void *data) date[0] = 0; - if (mailvar_is_true ("datefield") + if (mailvar_is_true (mailvar_name_datefield) && mu_header_get_value (hdr, MU_HEADER_DATE, @@ -226,3 +226,3 @@ sender_string (mu_message_t msg) - if (mailvar_is_true ("fromfield")) + if (mailvar_is_true (mailvar_name_fromfield)) { @@ -241,3 +241,4 @@ sender_string (mu_message_t msg) { - if (mailvar_is_true ("showto") && mail_is_my_name (email)) + if (mailvar_is_true (mailvar_name_showto) + && mail_is_my_name (email)) { @@ -97,3 +97,3 @@ mail_if (int argc, char **argv) - if (mailvar_get (&mode, "mode", mailvar_type_string, 1)) + if (mailvar_get (&mode, mailvar_name_mode, mailvar_type_string, 1)) exit (EXIT_FAILURE); diff --git a/mail/mail.c b/mail/mail.c index 6feb049c4..b4d8f1d30 100644 --- a/mail/mail.c +++ b/mail/mail.c @@ -321,3 +321,4 @@ mail_cmdline (void *closure, int cont MU_ARG_UNUSED) { - if (mailvar_is_true ("autoinc") && !mu_mailbox_is_updated (mbox)) + if (mailvar_is_true (mailvar_name_autoinc) + && !mu_mailbox_is_updated (mbox)) { @@ -336,3 +337,3 @@ mail_cmdline (void *closure, int cont MU_ARG_UNUSED) - if (!rc && mailvar_is_true ("ignoreeof")) + if (!rc && mailvar_is_true (mailvar_name_ignoreeof)) { @@ -484,3 +485,3 @@ main (int argc, char **argv) /* Set the default mailer to sendmail. */ - mailvar_set ("sendmail", + mailvar_set (mailvar_name_sendmail, mu_strdup ("sendmail:" PATH_SENDMAIL), mailvar_type_string, @@ -539,3 +540,3 @@ main (int argc, char **argv) /* read system-wide mail.rc and user's .mailrc */ - if (mailvar_is_true ("rc")) + if (mailvar_is_true (mailvar_name_rc)) util_do_command ("source %s", SITE_MAIL_RC); @@ -568,3 +569,3 @@ main (int argc, char **argv) /* how should we be running? */ - if (mailvar_get (&mode, "mode", mailvar_type_string, 1)) + if (mailvar_get (&mode, mailvar_name_mode, mailvar_type_string, 1)) exit (EXIT_FAILURE); @@ -584,3 +585,3 @@ main (int argc, char **argv) rc = util_do_command ("mail %s", buf); - return mailvar_is_true ("mailx") ? 0 : rc; + return mailvar_is_true (mailvar_name_mailx) ? 0 : rc; } @@ -654,3 +655,3 @@ main (int argc, char **argv) mu_error (_("Unknown mode `%s'"), mode); - util_do_command ("quit"); + util_do_command (mailvar_name_quit); return 1; @@ -660,3 +661,4 @@ main (int argc, char **argv) if (total == 0 - && (strcmp (mode, "read") || !mailvar_is_true ("emptystart"))) + && (strcmp (mode, "read") + || !mailvar_is_true (mailvar_name_emptystart))) { @@ -670,3 +672,3 @@ main (int argc, char **argv) /* initial commands */ - if (mailvar_is_true ("header")) + if (mailvar_is_true (mailvar_name_header)) { @@ -676,6 +678,6 @@ main (int argc, char **argv) - mailvar_get (&prompt, "prompt", mailvar_type_string, 0); + mailvar_get (&prompt, mailvar_name_prompt, mailvar_type_string, 0); mail_mainloop (mail_cmdline, (void*) prompt, 1); mu_printf ("\n"); - util_do_command ("quit"); + util_do_command (mailvar_name_quit); return 0; diff --git a/mail/mail.h b/mail/mail.h index f878e299f..081cc371a 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -134,3 +134,3 @@ struct mail_escape_entry }; - + enum mailvar_type @@ -158,2 +158,77 @@ struct mailvar_variable +/* Internal variable names */ +#define mailvar_name_allnet "allnet" +#define mailvar_name_append "append" +#define mailvar_name_appenddeadletter "appenddeadletter" +#define mailvar_name_askbcc "askbcc" +#define mailvar_name_askcc "askcc" +#define mailvar_name_ask "ask" +#define mailvar_name_asksub "asksub" +#define mailvar_name_autoinc "autoinc" +#define mailvar_name_autoprint "autoprint" +#define mailvar_name_byname "byname" +#define mailvar_name_bang "bang" +#define mailvar_name_charset "charset" +#define mailvar_name_cmd "cmd" +#define mailvar_name_columns "columns" +#define mailvar_name_crt "crt" +#define mailvar_name_datefield "datefield" +#define mailvar_name_debug "debug" +#define mailvar_name_decode_fallback "decode-fallback" +#define mailvar_name_dot "dot" +#define mailvar_name_editheaders "editheaders" +#define mailvar_name_emptystart "emptystart" +#define mailvar_name_escape "escape" +#define mailvar_name_flipr "flipr" +#define mailvar_name_folder "folder" +#define mailvar_name_fromfield "fromfield" +#define mailvar_name_gnu_last_command "gnu-last-command" +#define mailvar_name_header "header" +#define mailvar_name_headline "headline" +#define mailvar_name_hold "hold" +#define mailvar_name_ignore "ignore" +#define mailvar_name_ignoreeof "ignoreeof" +#define mailvar_name_indentprefix "indentprefix" +#define mailvar_name_inplacealiases "inplacealiases" +#define mailvar_name_keep "keep" +#define mailvar_name_keepsave "keepsave" +#define mailvar_name_mailx "mailx" +#define mailvar_name_metamail "metamail" +#define mailvar_name_metoo "metoo" +#define mailvar_name_mimenoask "mimenoask" +#define mailvar_name_mode "mode" +#define mailvar_name_nullbody "nullbody" +#define mailvar_name_nullbodymsg "nullbodymsg" +#define mailvar_name_outfolder "outfolder" +#define mailvar_name_page "page" +#define mailvar_name_prompt "prompt" +#define mailvar_name_quit "quit" +#define mailvar_name_rc "rc" +#define mailvar_name_readonly "readonly" +#define mailvar_name_record "record" +#define mailvar_name_recursivealiases "recursivealiases" +#define mailvar_name_regex "regex" +#define mailvar_name_replyprefix "replyprefix" +#define mailvar_name_replyregex "replyregex" +#define mailvar_name_return_address "return-address" +#define mailvar_name_save "save" +#define mailvar_name_screen "screen" +#define mailvar_name_sendmail "sendmail" +#define mailvar_name_sendwait "sendwait" +#define mailvar_name_sign "sign" +#define mailvar_name_Sign "Sign" +#define mailvar_name_showenvelope "showenvelope" +#define mailvar_name_showto "showto" +#define mailvar_name_toplines "toplines" +#define mailvar_name_variable_pretty_print "variable-pretty-print" +#define mailvar_name_varpp "varpp" +#define mailvar_name_variable_strict "variable-strict" +#define mailvar_name_varstrict "varstrict" +#define mailvar_name_verbose "verbose" +#define mailvar_name_xmailer "xmailer" +#define mailvar_name_mime "mime" +#define mailvar_name_onehop "onehop" +#define mailvar_name_quiet "quiet" +#define mailvar_name_PID "PID" + typedef struct message_set msgset_t; diff --git a/mail/mailline.c b/mail/mailline.c index 610fee291..647cb1e17 100644 --- a/mail/mailline.c +++ b/mail/mailline.c @@ -35,3 +35,3 @@ sig_handler (int signo) case SIGINT: - if (mailvar_is_true ("quit")) + if (mailvar_is_true (mailvar_name_quit)) exit (0); diff --git a/mail/mailvar.c b/mail/mailvar.c index f5f1b6dc2..e39ea721a 100644 --- a/mail/mailvar.c +++ b/mail/mailvar.c @@ -58,3 +58,3 @@ struct mailvar_symbol mailvar_tab[] = /* FIXME: */ - { { "allnet", }, MAILVAR_HIDDEN }, + { { mailvar_name_allnet, }, MAILVAR_HIDDEN }, @@ -62,25 +62,25 @@ struct mailvar_symbol mailvar_tab[] = Never used, always true. */ - { { "append", }, + { { mailvar_name_append, }, MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_RDONLY, N_("messages saved in mbox are appended to the end rather than prepended") }, - { { "appenddeadletter", }, + { { mailvar_name_appenddeadletter, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("append the contents of canceled letter to dead.letter file") }, - { { "askbcc", }, + { { mailvar_name_askbcc, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("prompt user for bcc before composing the message") }, - { { "askcc", }, + { { mailvar_name_askcc, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("prompt user for cc before composing the message") }, - { { "ask", }, + { { mailvar_name_ask, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("prompt user for subject before composing the message") }, - { { "asksub", }, MAILVAR_ALIAS, NULL }, - { { "autoinc", }, + { { mailvar_name_asksub, }, MAILVAR_ALIAS, NULL }, + { { mailvar_name_autoinc, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("automatically incorporate newly arrived messages")}, - { { "autoprint", }, + { { mailvar_name_autoprint, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("delete command behaves like dp") }, - { { "byname" }, + { { mailvar_name_byname }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -88,3 +88,3 @@ struct mailvar_symbol mailvar_tab[] = "overrides the `record' variable") }, - { { "bang", }, + { { mailvar_name_bang, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -92,12 +92,12 @@ struct mailvar_symbol mailvar_tab[] = " with the last executed command") }, - { { "charset", }, + { { mailvar_name_charset, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("output character set for decoded header fields") }, - { { "cmd", }, + { { mailvar_name_cmd, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("default shell command for pipe") }, - { { "columns", }, + { { mailvar_name_columns, }, MAILVAR_TYPEMASK (mailvar_type_number), N_("number of columns on terminal screen") }, - { { "crt", }, + { { mailvar_name_crt, }, MAILVAR_TYPEMASK (mailvar_type_number) | @@ -107,6 +107,6 @@ struct mailvar_symbol mailvar_tab[] = "screen to compute the threshold") }, - { { "datefield", }, + { { mailvar_name_datefield, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("get date from the `Date:' header, instead of the envelope") }, - { { "debug", }, + { { mailvar_name_debug, }, MAILVAR_TYPEMASK (mailvar_type_string) | @@ -115,3 +115,3 @@ struct mailvar_symbol mailvar_tab[] = set_debug }, - { { "decode-fallback", }, + { { mailvar_name_decode_fallback, }, MAILVAR_TYPEMASK (mailvar_type_string), @@ -120,18 +120,18 @@ struct mailvar_symbol mailvar_tab[] = set_decode_fallback }, - { { "dot", }, + { { mailvar_name_dot, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("input message is terminated with a dot alone on a line") }, - { { "editheaders", }, + { { mailvar_name_editheaders, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("allow editing message headers while composing") }, - { { "emptystart", }, + { { mailvar_name_emptystart, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("start interactive mode if the mailbox is empty") }, - { { "escape", }, + { { mailvar_name_escape, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("character denoting escapes") }, - { { "flipr", }, + { { mailvar_name_flipr, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("swap the meaning of reply and Reply commands") }, - { { "folder", }, + { { mailvar_name_folder, }, MAILVAR_TYPEMASK (mailvar_type_string), @@ -139,3 +139,3 @@ struct mailvar_symbol mailvar_tab[] = set_folder }, - { { "fromfield", }, + { { mailvar_name_fromfield, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -143,9 +143,9 @@ struct mailvar_symbol mailvar_tab[] = "the envelope") }, - { { "gnu-last-command", }, + { { mailvar_name_gnu_last_command, }, MAILVAR_TYPEMASK (mailvar_type_string) | MAILVAR_RDONLY, N_("last executed command line") }, - { { "header", }, + { { mailvar_name_header, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("run the `headers' command after entering interactive mode") }, - { { "headline", }, + { { mailvar_name_headline, }, MAILVAR_TYPEMASK (mailvar_type_string), @@ -153,15 +153,15 @@ struct mailvar_symbol mailvar_tab[] = set_headline }, - { { "hold", }, + { { mailvar_name_hold, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("hold the read or saved messages in the system mailbox") }, - { { "ignore", }, + { { mailvar_name_ignore, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("ignore keyboard interrupts when composing messages") }, - { { "ignoreeof", }, + { { mailvar_name_ignoreeof, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("ignore EOF character") }, - { { "indentprefix", }, + { { mailvar_name_indentprefix, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("string used by the ~m escape for indenting quoted messages") }, - { { "inplacealiases", }, + { { mailvar_name_inplacealiases, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -171,3 +171,3 @@ struct mailvar_symbol mailvar_tab[] = Never used, always true. */ - { { "keep", }, + { { mailvar_name_keep, }, MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_RDONLY, @@ -175,9 +175,9 @@ struct mailvar_symbol mailvar_tab[] = " instead of removing it") }, - { { "keepsave", }, + { { mailvar_name_keepsave, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("keep saved messages in system mailbox too") }, - { { "mailx", }, + { { mailvar_name_mailx, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("enable mailx compatibility mode") }, - { { "metamail", }, + { { mailvar_name_metamail, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -185,6 +185,6 @@ struct mailvar_symbol mailvar_tab[] = "specifies the name of the external metamail command") }, - { { "metoo", }, + { { mailvar_name_metoo, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("do not remove sender addresses from the recipient list") }, - { { "mimenoask", }, + { { mailvar_name_mimenoask, }, MAILVAR_TYPEMASK (mailvar_type_string), @@ -192,42 +192,42 @@ struct mailvar_symbol mailvar_tab[] = "no confirmation is needed before running metamail interpreter") }, - { { "mode", }, + { { mailvar_name_mode, }, MAILVAR_TYPEMASK (mailvar_type_string) | MAILVAR_RDONLY, N_("the name of current operation mode") }, - { { "nullbody", }, + { { mailvar_name_nullbody, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("accept messages with an empty body") }, - { { "nullbodymsg", }, + { { mailvar_name_nullbodymsg, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("display this text when sending a message with empty body") }, - { { "outfolder", }, + { { mailvar_name_outfolder, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("keep created files in this folder") }, - { { "page", }, + { { mailvar_name_page, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("pipe command terminates each message with a formfeed") }, - { { "prompt", }, + { { mailvar_name_prompt, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("command prompt sequence") }, - { { "quit", }, + { { mailvar_name_quit, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("keyboard interrupts terminate the program") }, - { { "rc", }, + { { mailvar_name_rc, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("read the system-wide configuration file upon startup") }, - { { "readonly", }, + { { mailvar_name_readonly, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("mailboxes are opened in readonly mode") }, - { { "record", }, + { { mailvar_name_record, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("save outgoing messages in this file") }, - { { "recursivealiases", }, + { { mailvar_name_recursivealiases, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("recursively expand aliases") }, - { { "regex", }, + { { mailvar_name_regex, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("use of regular expressions in search message specifications") }, - { { "replyprefix", }, + { { mailvar_name_replyprefix, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("prefix for the subject line of a reply message") }, - { { "replyregex", }, + { { mailvar_name_replyregex, }, MAILVAR_TYPEMASK (mailvar_type_string), @@ -235,9 +235,9 @@ struct mailvar_symbol mailvar_tab[] = set_replyregex }, - { { "return-address" }, + { { mailvar_name_return_address }, MAILVAR_TYPEMASK (mailvar_type_string), N_("return address for outgoing messages") }, - { { "save", }, + { { mailvar_name_save, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("store aborted messages in the user's dead.file") }, - { { "screen", }, + { { mailvar_name_screen, }, MAILVAR_TYPEMASK (mailvar_type_number), @@ -245,3 +245,3 @@ struct mailvar_symbol mailvar_tab[] = set_screen }, - { { "sendmail", }, + { { mailvar_name_sendmail, }, MAILVAR_TYPEMASK (mailvar_type_string), @@ -249,14 +249,14 @@ struct mailvar_symbol mailvar_tab[] = /* FIXME: Not yet used. */ - { { "sendwait", }, + { { mailvar_name_sendwait, }, MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_HIDDEN, NULL }, - { { "sign", }, + { { mailvar_name_sign, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("signature for use with the ~a command") }, - { { "Sign", }, + { { mailvar_name_Sign, }, MAILVAR_TYPEMASK (mailvar_type_string), N_("name of the signature file for use with the ~A command") }, - { { "showenvelope", }, + { { mailvar_name_showenvelope, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("`print' command includes the SMTP envelope in its output") }, - { { "showto", }, + { { mailvar_name_showto, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -264,14 +264,14 @@ struct mailvar_symbol mailvar_tab[] = "in the header summary") }, - { { "toplines", }, + { { mailvar_name_toplines, }, MAILVAR_TYPEMASK (mailvar_type_number), N_("number of lines to be displayed by `top' or `Top'") }, - { { "variable-pretty-print", }, + { { mailvar_name_variable_pretty_print, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("print variables with short descriptions") }, - { { "varpp", }, MAILVAR_ALIAS }, - { { "variable-strict", }, + { { mailvar_name_varpp, }, MAILVAR_ALIAS }, + { { mailvar_name_variable_strict, }, MAILVAR_TYPEMASK (mailvar_type_boolean), N_("perform strict checking when setting variables") }, - { { "varstrict", }, MAILVAR_ALIAS }, - { { "verbose", }, + { { mailvar_name_varstrict, }, MAILVAR_ALIAS }, + { { mailvar_name_verbose, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -279,3 +279,3 @@ struct mailvar_symbol mailvar_tab[] = set_verbose }, - { { "xmailer", }, + { { mailvar_name_xmailer, }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -283,3 +283,3 @@ struct mailvar_symbol mailvar_tab[] = - { { "mime" }, + { { mailvar_name_mime }, MAILVAR_TYPEMASK (mailvar_type_boolean), @@ -288,8 +288,10 @@ struct mailvar_symbol mailvar_tab[] = /* These will be implemented later */ - { { "onehop", }, MAILVAR_HIDDEN, NULL }, + { { mailvar_name_onehop, }, MAILVAR_HIDDEN, NULL }, - { { "quiet", }, MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_HIDDEN, + { { mailvar_name_quiet, }, + MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_HIDDEN, N_("suppress the printing of the version when first invoked") }, - { { "PID" }, MAILVAR_TYPEMASK (mailvar_type_string) | MAILVAR_RDONLY, + { { mailvar_name_PID }, + MAILVAR_TYPEMASK (mailvar_type_string) | MAILVAR_RDONLY, N_("PID of this process") }, @@ -299,3 +301,4 @@ struct mailvar_symbol mailvar_tab[] = -static int mailvar_symbol_count = sizeof (mailvar_tab) / sizeof (mailvar_tab[0]) - 1; +static int mailvar_symbol_count = + sizeof (mailvar_tab) / sizeof (mailvar_tab[0]) - 1; @@ -324,4 +327,3 @@ print_descr (mu_stream_t out, const char *s, int n, - mu_stream_set_stat (out, MU_STREAM_STAT_MASK (MU_STREAM_STAT_OUT), - stat); + mu_stream_set_stat (out, MU_STREAM_STAT_MASK (MU_STREAM_STAT_OUT), stat); stat[MU_STREAM_STAT_OUT] = n; @@ -510,3 +512,3 @@ mailvar_set (const char *variable, void *value, enum mailvar_type type, - if (!(flags & MOPTF_QUIET) && mailvar_is_true ("variable-strict")) + if (!(flags & MOPTF_QUIET) && mailvar_is_true (mailvar_name_variable_strict)) { @@ -921,3 +923,3 @@ mailvar_print (int set) clos.out = open_pager (count); - clos.prettyprint = mailvar_is_true ("variable-pretty-print"); + clos.prettyprint = mailvar_is_true (mailvar_name_variable_pretty_print); clos.width = util_screen_columns (); diff --git a/mail/pipe.c b/mail/pipe.c index 708a01ef2..af8f23d2b 100644 --- a/mail/pipe.c +++ b/mail/pipe.c @@ -33,3 +33,3 @@ mail_pipe (int argc, char **argv) cmd = argv[--argc]; - else if (mailvar_get (&cmd, "cmd", mailvar_type_string, 1)) + else if (mailvar_get (&cmd, mailvar_name_cmd, mailvar_type_string, 1)) return 1; @@ -56,3 +56,3 @@ mail_pipe (int argc, char **argv) mu_stream_destroy (&stream); - if (mailvar_is_true ("page")) + if (mailvar_is_true (mailvar_name_page)) mu_stream_write (outstr, "\f\n", 2, NULL); diff --git a/mail/print.c b/mail/print.c index 37371c0f9..e2e97a6a3 100644 --- a/mail/print.c +++ b/mail/print.c @@ -37,3 +37,3 @@ mail_print_msg (msgset_t *mspec, mu_message_t mesg, void *data) mu_message_lines (mesg, &lines); - if (mailvar_is_true ("showenvelope")) + if (mailvar_is_true (mailvar_name_showenvelope)) lines++; @@ -58,3 +58,3 @@ mail_print_msg (msgset_t *mspec, mu_message_t mesg, void *data) - if (mailvar_is_true ("showenvelope")) + if (mailvar_is_true (mailvar_name_showenvelope)) print_stream_envelope (out, mspec, mesg, "From"); diff --git a/mail/quit.c b/mail/quit.c index 7d964b89d..2e8b5a1cd 100644 --- a/mail/quit.c +++ b/mail/quit.c @@ -40,3 +40,3 @@ mail_mbox_close () - if (!mailvar_is_true ("readonly")) + if (!mailvar_is_true (mailvar_name_readonly)) { @@ -68,4 +68,4 @@ mail_mbox_commit () mu_attribute_t attr; - int keepsave = mailvar_is_true ("keepsave"); - int hold = mailvar_is_true ("hold"); + int keepsave = mailvar_is_true (mailvar_name_keepsave); + int hold = mailvar_is_true (mailvar_name_hold); mu_url_t url; @@ -106,4 +106,6 @@ mail_mbox_commit () || (!mu_attribute_is_userflag (attr, MAIL_ATTRIBUTE_SAVED) - && (mu_attribute_is_userflag (attr, MAIL_ATTRIBUTE_SHOWN) - || mu_attribute_is_userflag (attr, MAIL_ATTRIBUTE_TOUCHED))))))) + && (mu_attribute_is_userflag (attr, + MAIL_ATTRIBUTE_SHOWN) + || mu_attribute_is_userflag (attr, + MAIL_ATTRIBUTE_TOUCHED))))))) { @@ -122,3 +124,4 @@ mail_mbox_commit () if ((status = mu_mailbox_open (dest_mbox, - MU_STREAM_WRITE | MU_STREAM_CREAT))!=0) + MU_STREAM_WRITE | MU_STREAM_CREAT)) + != 0) { diff --git a/mail/reply.c b/mail/reply.c index 42c876aea..80ae4f83a 100644 --- a/mail/reply.c +++ b/mail/reply.c @@ -84,3 +84,3 @@ reply0 (msgset_t *mspec, mu_message_t msg, void *data) continue; - if (mailvar_is_true ("metoo") || !mail_is_my_name (email)) + if (mailvar_is_true (mailvar_name_metoo) || !mail_is_my_name (email)) compose_header_set (&env, MU_HEADER_TO, @@ -121,3 +121,3 @@ reply0 (msgset_t *mspec, mu_message_t msg, void *data) make_references (&env, msg); - status = mail_send0 (&env, mailvar_is_true ("byname")); + status = mail_send0 (&env, mailvar_is_true (mailvar_name_byname)); compose_destroy (&env); @@ -131,3 +131,3 @@ mail_reply (int argc, char **argv) int lower = mu_islower (argv[0][0]); - if (mailvar_is_true ("flipr")) + if (mailvar_is_true (mailvar_name_flipr)) lower = !lower; diff --git a/mail/send.c b/mail/send.c index e33c44bbd..ae2cbb764 100644 --- a/mail/send.c +++ b/mail/send.c @@ -558,3 +558,3 @@ add_attachments (compose_env_t *env, mu_message_t *pmsg) - if (mailvar_is_true ("mime") && add_body (inmsg, env)) + if (mailvar_is_true (mailvar_name_mime) && add_body (inmsg, env)) return 1; @@ -641,6 +641,6 @@ read_cc_bcc (compose_env_t *env) { - if (mailvar_is_true ("askcc")) + if (mailvar_is_true (mailvar_name_askcc)) compose_header_set (env, MU_HEADER_CC, ml_readline_with_intr ("Cc: "), COMPOSE_REPLACE); - if (mailvar_is_true ("askbcc")) + if (mailvar_is_true (mailvar_name_askbcc)) compose_header_set (env, MU_HEADER_BCC, @@ -677,3 +677,3 @@ mail_send (int argc, char **argv) COMPOSE_REPLACE); - else if (mailvar_is_true ("editheaders")) + else if (mailvar_is_true (mailvar_name_editheaders)) { @@ -732,6 +732,6 @@ mail_send (int argc, char **argv) { - if (!mailvar_is_true ("mailx")) + if (!mailvar_is_true (mailvar_name_mailx)) read_cc_bcc (&env); - if (mailvar_is_true ("asksub")) + if (mailvar_is_true (mailvar_name_asksub)) compose_header_set (&env, MU_HEADER_SUBJECT, @@ -881,3 +881,4 @@ compose_header_set (compose_env_t *env, const char *name, case COMPOSE_REPLACE: - if (is_address_field (name) && mailvar_is_true ("inplacealiases")) + if (is_address_field (name) + && mailvar_is_true (mailvar_name_inplacealiases)) { @@ -892,3 +893,4 @@ compose_header_set (compose_env_t *env, const char *name, case COMPOSE_APPEND: - if (is_address_field (name) && mailvar_is_true ("inplacealiases")) + if (is_address_field (name) + && mailvar_is_true (mailvar_name_inplacealiases)) { @@ -906,3 +908,4 @@ compose_header_set (compose_env_t *env, const char *name, { - if (is_address_field (name) && mailvar_is_true ("inplacealiases")) + if (is_address_field (name) + && mailvar_is_true (mailvar_name_inplacealiases)) { @@ -990,6 +993,7 @@ fill_body (mu_message_t msg, mu_stream_t instr) { - if (mailvar_is_true ("nullbody")) + if (mailvar_is_true (mailvar_name_nullbody)) { char *str; - if (mailvar_get (&str, "nullbodymsg", mailvar_type_string, 0) == 0) + if (mailvar_get (&str, mailvar_name_nullbodymsg, + mailvar_type_string, 0) == 0) mu_error ("%s", _(str)); @@ -1006,3 +1010,3 @@ save_dead_message_env (compose_env_t *env) { - if (mailvar_is_true ("save")) + if (mailvar_is_true (mailvar_name_save)) { @@ -1024,3 +1028,3 @@ save_dead_message_env (compose_env_t *env) } - if (mailvar_is_true ("appenddeadletter")) + if (mailvar_is_true (mailvar_name_appenddeadletter))< |