diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cd.c | 15 | ||||
| -rw-r--r-- | mail/copy.c | 1 | ||||
| -rw-r--r-- | mail/file.c | 24 | ||||
| -rw-r--r-- | mail/mailline.c | 353 | ||||
| -rw-r--r-- | mail/mailvar.c | 2 | ||||
| -rw-r--r-- | mail/util.c | 133 |
6 files changed, 328 insertions, 200 deletions
@@ -24,7 +24,8 @@ int mail_cd (int argc, char **argv) { - char *dir; + char *dir, *edir; + int rc; if (argc > 2) return 1; @@ -33,10 +34,16 @@ mail_cd (int argc, char **argv) else dir = getenv ("HOME"); - if (chdir (dir)) + rc = mu_mailbox_expand_name (dir, &edir); + if (rc) { - mu_diag_funcall (MU_DIAG_ERROR, "chdir", dir, errno); + mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_expand_name", dir, rc); return 1; } - return 0; + + rc = chdir (edir); + if (rc) + mu_diag_funcall (MU_DIAG_ERROR, "chdir", edir, errno); + free (edir); + return rc; } diff --git a/mail/copy.c b/mail/copy.c index 476b441bc..15deebe6f 100644 --- a/mail/copy.c +++ b/mail/copy.c @@ -45,6 +45,7 @@ append_to_mailbox (char const *filename, msgset_t *msglist, int mark, mu_strerror (status)); return 1; } + mu_mailbox_attach_ticket (mbx); if ((status = mu_mailbox_open (mbx, MU_STREAM_WRITE | MU_STREAM_CREAT)) != 0) { mu_error (_("Cannot open mailbox %s: %s"), filename, diff --git a/mail/file.c b/mail/file.c index 517a6b7db..bc94f130e 100644 --- a/mail/file.c +++ b/mail/file.c @@ -30,7 +30,7 @@ mail_expand_name (const char *name) { int status = 0; char *exp = NULL; - + if (strcmp (name, "#") == 0) { if (!prev_name) @@ -84,9 +84,18 @@ mail_file (int argc, char **argv) if (!name) return 1; - - if ((status = mu_mailbox_create (&newbox, name)) != 0 - || (status = mu_mailbox_open (newbox, MU_STREAM_RDWR)) != 0) + + status = mu_mailbox_create (&newbox, name); + if (status) + { + mu_error(_("Cannot create mailbox %s: %s"), name, + mu_strerror (status)); + free (name); + return 1; + } + mu_mailbox_attach_ticket (newbox); + + if ((status = mu_mailbox_open (newbox, MU_STREAM_RDWR)) != 0) { mu_mailbox_destroy (&newbox); mu_error(_("Cannot open mailbox %s: %s"), name, mu_strerror (status)); @@ -96,7 +105,7 @@ mail_file (int argc, char **argv) free (name); /* won't need it any more */ page_invalidate (1); /* Invalidate current page map */ - + mu_mailbox_get_url (mbox, &url); pname = mu_strdup (mu_url_to_string (url)); if (mail_mbox_close ()) @@ -107,11 +116,11 @@ mail_file (int argc, char **argv) mu_mailbox_destroy (&newbox); return 1; } - + if (prev_name) free (prev_name); prev_name = pname; - + mbox = newbox; mu_mailbox_messages_count (mbox, &total); set_cursor (1); @@ -128,4 +137,3 @@ mail_file (int argc, char **argv) } return 1; } - diff --git a/mail/mailline.c b/mail/mailline.c index f1fa4b2fd..157412513 100644 --- a/mail/mailline.c +++ b/mail/mailline.c @@ -18,6 +18,7 @@ #include <sys/stat.h> #include <dirent.h> #include <mailutils/folder.h> +#include <mailutils/auth.h> #ifdef WITH_READLINE static char **ml_command_completion (char *cmd, int start, int end); @@ -209,7 +210,7 @@ ml_command_completion (char *cmd, int start, int end) char **ret; char *p; struct mu_wordsplit ws; - + for (p = rl_line_buffer; p < rl_line_buffer + start && mu_isblank (*p); p++) ; @@ -239,7 +240,7 @@ ml_command_completion (char *cmd, int start, int end) point |= COMPL_WS; if (mu_str_skip_class (p + end, MU_CTYPE_SPACE)[0] == 0) point |= COMPL_LASTARG; - + ret = entry->command_completion (ws.ws_wordc, ws.ws_wordv, point); } else @@ -295,7 +296,7 @@ ml_attempted_completion_over (void) be returned by rl_completion_matches, i.e. their first entry is the longest common prefix of the remaining entries, which are sorted lexicographically. Array B is treated as case-insensitive. - + If either of the arrays is NULL, the other one is returned unchanged. Otherwise, if A[0] begins with a lowercase letter, all items from B @@ -312,7 +313,7 @@ compl_concat (char **a, char **b) size_t i, j, k, n = 0, an, bn; char **ret; int lwr = 0; - + if (a) { lwr = mu_islower (a[0][0]); @@ -321,21 +322,21 @@ compl_concat (char **a, char **b) } else return b; - + if (b) { for (bn = 0; b[bn]; bn++) { if (lwr) mu_strlower (b[bn]); - } + } } else return a; i = an == 1 ? 0 : 1; j = bn == 1 ? 0 : 1; - + n = (an - i) + (bn - j) + 1; ret = mu_calloc (n + 1, sizeof (ret[0])); @@ -356,7 +357,7 @@ compl_concat (char **a, char **b) free (a[0]); if (j) free (b[0]); - + k = 1; while (k < n) { @@ -377,7 +378,7 @@ compl_concat (char **a, char **b) free (a); free (b); return ret; -} +} static char *msgtype_generator (const char *text, int state); static char *header_generator (const char *text, int state); @@ -389,7 +390,7 @@ static char *header_generator (const char *text, int state); In the latter case the MATCHES function generates expansions for the last argument. It is used for such commands as write, where the last object is a mailbox or pipe, where it is a command). - + CLOSURE supplies argument for MATCHES. It is ignored if MATCHES is NULL. */ static char ** @@ -399,7 +400,7 @@ msglist_closure_compl (int argc, char **argv, int point, { char *text = (point & COMPL_WS) ? "" : argv[argc-1]; size_t len = strlen (text); - + if (text[0] == ':') { if (text[1] && (text[1] == '/' || text[2])) @@ -411,7 +412,7 @@ msglist_closure_compl (int argc, char **argv, int point, ml_set_completion_append_character (' '); return rl_completion_matches (text, msgtype_generator); } - + ml_set_completion_append_character (0); if (len && text[len-1] == ':') { @@ -450,111 +451,211 @@ command_compl (int argc, char **argv, int point) return NULL; return rl_completion_matches (argv[argc-1], ml_command_generator); } + +struct filegen +{ + mu_list_t list; + mu_iterator_t itr; + size_t pathlen; + char repl; + int flags; +}; -/* Generate file list based on reference prefix TEXT, relative to PATH. - Remove PATHLEN leading characters from the returned names. Replace - them with REPL unless it is 0. +static void +filegen_free (struct filegen *fg) +{ + mu_iterator_destroy (&fg->itr); + mu_list_destroy (&fg->list); +} - Select only those files that match given FLAGS (MU_FOLDER_ATTRIBUTE_* - constants). +enum + { + any_folder, + local_folder + }; - STATE is 0 for the first call, 1 otherwise. - */ -static char * -file_generator (const char *text, int state, - char *path, size_t pathlen, - char repl, - int flags) +#define PATHLEN_AUTO ((size_t)-1) + +static int +filegen_init (struct filegen *fg, + const char *text, + const char *folder_path, + int type, + size_t pathlen, + int repl, + int flags) { - static mu_list_t list; - static mu_iterator_t itr; + char *pathref; + char *wcard; + mu_folder_t folder; + size_t count, i, len; + mu_url_t url; + int rc; - if (!state) - { - char *wcard; - mu_folder_t folder; - size_t count; + pathref = mu_strdup (text); + len = strlen (pathref); + for (i = len; i > 0; i--) + if (pathref[i-1] == '/') + break; + wcard = mu_alloc (len - i + 2); + strcpy (wcard, pathref + i); + strcat (wcard, "%"); + pathref[i] = 0; - wcard = mu_alloc (strlen (text) + 2); - strcat (strcpy (wcard, text), "*"); + rc = mu_folder_create (&folder, folder_path); + if (rc) + { + mu_diag_funcall (MU_DIAG_ERROR, "mu_folder_create", folder_path, rc); + free (wcard); + free (pathref); + return -1; + } - if (mu_folder_create (&folder, path)) + if (!mu_folder_is_local (folder)) + { + if (type == local_folder) { + mu_error ("%s", _("folder must be set to a local folder")); free (wcard); - return NULL; + free (pathref); + return -1; } - mu_folder_list (folder, path, wcard, 1, &list); + /* Set ticket for a remote folder */ + rc = mu_folder_attach_ticket (folder); + if (rc) + { + mu_authority_t auth = NULL; + + if (mu_folder_get_authority (folder, &auth) == 0 && auth) + { + mu_ticket_t tct; + mu_noauth_ticket_create (&tct); + rc = mu_authority_set_ticket (auth, tct); + if (rc) + mu_diag_funcall (MU_DIAG_ERROR, "mu_authority_set_ticket", + NULL, rc); + } + } + } + + rc = mu_folder_open (folder, MU_STREAM_READ); + if (rc) + { + mu_diag_funcall (MU_DIAG_ERROR, "mu_folder_open", folder_path, rc); free (wcard); + free (pathref); + return -1; + } + + if (mu_folder_get_url (folder, &url)) + { + free (wcard); + free (pathref); mu_folder_destroy (&folder); + } - if (mu_list_count (list, &count) || count == 0) - { - mu_list_destroy (&list); - return NULL; - } - else if (count == 1) - ml_set_completion_append_character (0); + if (pathlen == PATHLEN_AUTO) + { + char const *urlpath; + + mu_url_sget_path (url, &urlpath); + fg->pathlen = strlen (urlpath); + while (fg->pathlen > 0 && urlpath[fg->pathlen-1] == '/') + fg->pathlen--; + if (fg->pathlen == 1 && urlpath[0] == '/') + fg->pathlen = 0; + } + else + fg->pathlen = pathlen; - if (mu_list_get_iterator (list, &itr)) + mu_folder_list (folder, pathref, wcard, 1, &fg->list); + free (wcard); + free (pathref); + mu_folder_destroy (&folder); + + if (mu_list_count (fg->list, &count) || count == 0) + { + mu_list_destroy (&fg->list); + return -1; + } + else if (count == 1) + { + if (flags & MU_FOLDER_ATTRIBUTE_DIRECTORY) { - mu_list_destroy (&list); - return NULL; + struct mu_list_response *resp; + mu_list_head (fg->list, (void**)&resp); + if (resp->type & MU_FOLDER_ATTRIBUTE_DIRECTORY) + { + size_t len = strlen (resp->name); + resp->name = mu_realloc (resp->name, len + 2); + resp->name[len] = resp->separator; + resp->name[len+1] = 0; + } } - mu_iterator_first (itr); + ml_set_completion_append_character (0); } - while (!mu_iterator_is_done (itr)) + if (mu_list_get_iterator (fg->list, &fg->itr)) + { + mu_list_destroy (&fg->list); + return -1; + } + mu_iterator_first (fg->itr); + fg->repl = repl; + fg->flags = flags; + return 0; +} + +static char * +filegen_next (struct filegen *fg) +{ + while (!mu_iterator_is_done (fg->itr)) { struct mu_list_response *resp; - mu_iterator_current (itr, (void**)&resp); - mu_iterator_next (itr); - if (resp->type & flags) + mu_iterator_current (fg->itr, (void**)&resp); + mu_iterator_next (fg->itr); + if (resp->type & fg->flags) { char *ret; - if (pathlen) - { - size_t len = strlen (resp->name + pathlen); - char *ptr; - - ret = mu_alloc (len + (repl ? 1 : 0) + 1); - ptr = ret; - if (repl) - *ptr++ = repl; - memcpy (ptr, resp->name + pathlen, len); - ptr[len] = 0; - } - else - ret = mu_strdup (resp->name); + size_t len = strlen (resp->name + fg->pathlen); + char *ptr; + + ret = mu_alloc (len + (fg->repl ? 1 : 0) + 1); + ptr = ret; + if (fg->repl) + *ptr++ = fg->repl; + memcpy (ptr, resp->name + fg->pathlen, len); + ptr[len] = 0; + // if (resp->type & (fg->flags & MU_FOLDER_ATTRIBUTE_DIRECTORY)) return ret; } } - mu_iterator_destroy (&itr); - mu_list_destroy (&list); + filegen_free (fg); return NULL; } static char * folder_generator (const char *text, int state) { - char *ret; - static size_t pathlen; + static struct filegen fg; if (!state) { - char *path = util_folder_path (""); + int rc; + char *path = util_folder_path ("+"); if (!path) return NULL; - pathlen = strlen (path); - ret = file_generator (text, state, path, pathlen, '+', - MU_FOLDER_ATTRIBUTE_ALL); + rc = filegen_init (&fg, text, path, + any_folder, + PATHLEN_AUTO, '+', + MU_FOLDER_ATTRIBUTE_ALL); free (path); + if (rc) + return NULL; } - else - ret = file_generator (text, state, NULL, pathlen, '+', - MU_FOLDER_ATTRIBUTE_ALL); - return ret; + return filegen_next (&fg); } static char * @@ -562,7 +663,7 @@ msgtype_generator (const char *text, int state) { /* Allowed message types, plus '/'. The latter can folow a colon, meaning body lookup */ - static char types[] = "dnorTtu/"; + static char types[] = "dnorTtu/"; static int i; char c; @@ -659,7 +760,7 @@ char ** file_compl (int argc, char **argv, int point) { char *text; - + if (point & COMPL_WS) { ml_set_completion_append_character (0); @@ -679,12 +780,12 @@ file_compl (int argc, char **argv, int point) case '&': ml_attempted_completion_over (); break; - + default: /* Suppose it is a file name */ return rl_completion_matches (text, rl_filename_completion_function); } - + return NULL; } @@ -712,32 +813,45 @@ msglist_file_compl (int argc, char **argv, int point) static char * dir_generator (const char *text, int state) { - char *ret; - static size_t pathlen; - static int repl; + static struct filegen fg; if (!state) { char *path; + char *p; + int rc; + char repl; + size_t pathlen; + switch (text[0]) { case '+': - text++; - repl = '+'; - path = util_folder_path (text); - pathlen = strlen (path) - strlen (text); + { + char *f; + repl = '+'; + f = util_folder_path ("+"); + pathlen = strlen (f); + path = mu_make_file_name (f, text + 1); + free (f); + } break; case '~': repl = '~'; if (text[1] == '/') { - path = mu_get_homedir (); - text += 2; - pathlen = strlen (path); - break; + char *home = mu_get_homedir (); + pathlen = strlen (home); + path = mu_make_file_name (home, text + 2); + free (home); } - /* else FIXME! */ + else + { + ml_attempted_completion_over (); + return NULL; + /* FIXME: implement user-name completion */ + } + break; case '/': path = mu_strdup (text); @@ -746,19 +860,36 @@ dir_generator (const char *text, int state) break; default: - path = mu_strdup ("./"); - pathlen = 2; + { + char *cwd = mu_getcwd (); + pathlen = strlen (cwd); + path = mu_make_file_name (cwd, text); + free (cwd); + } repl = 0; } - - ret = file_generator (text, state, path, pathlen, repl, - MU_FOLDER_ATTRIBUTE_DIRECTORY); - free (path); + p = strrchr (path, '/'); + if (*p) + { + if (p[1]) + *p++ = 0; + else + p = ""; + rc = filegen_init (&fg, p, path[0] ? path : "/", + local_folder, + pathlen, repl, + MU_FOLDER_ATTRIBUTE_DIRECTORY); + } + else + { + ml_attempted_completion_over (); + rc = -1; + } + if (rc) + return NULL; } - else - ret = file_generator (text, state, NULL, pathlen, repl, - MU_FOLDER_ATTRIBUTE_DIRECTORY); - return ret; + + return filegen_next (&fg); } char ** @@ -801,20 +932,6 @@ alias_compl (int argc, char **argv, int point) } static char * -mkfilename (const char *dir, const char *file) -{ - size_t len = strlen (dir) + 1 + strlen (file) + 1; - char *p = malloc (len); - if (p) - { - strcpy (p, dir); - strcat (p, "/"); - strcat (p, file); - } - return p; -} - -static char * exec_generator (const char *text, int state) { static int prefix_len; @@ -877,7 +994,7 @@ exec_generator (const char *text, int state) while ((ent = readdir (dp))) { - char *name = mkfilename (dir, ent->d_name); + char *name = mu_make_file_name (dir, ent->d_name); if (name) { int rc = access (name, X_OK); diff --git a/mail/mailvar.c b/mail/mailvar.c index 206166c51..5cdb7f1c2 100644 --- a/mail/mailvar.c +++ b/mail/mailvar.c @@ -289,7 +289,7 @@ struct mailvar_symbol mailvar_tab[] = { { "quiet", }, MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_HIDDEN, "suppresses the printing of the version when first invoked" }, - + { { NULL }, } }; diff --git a/mail/util.c b/mail/util.c index 0475e9efd..f5471e77b 100644 --- a/mail/util.c +++ b/mail/util.c @@ -42,7 +42,7 @@ util_do_command (const char *fmt, ...) char *cmd = NULL; size_t size = 0; va_list ap; - + va_start (ap, fmt); status = mu_vasnprintf (&cmd, &size, fmt, ap); va_end (ap); @@ -61,7 +61,7 @@ util_do_command (const char *fmt, ...) if (cmd[0] == '\0') { free (cmd); - + /* Hitting return i.e. no command, is equivalent to next according to the POSIX spec. Note, that this applies to interactive state only. */ @@ -85,7 +85,7 @@ util_do_command (const char *fmt, ...) argc = ws.ws_wordc; argv = ws.ws_wordv + 1; - + /* Special case: a number alone implies "print" */ if (argc == 1 && ((strtoul (argv[0], &p, 10) > 0 && *p == 0) @@ -108,16 +108,16 @@ util_do_command (const char *fmt, ...) { /* argv[0] might be a traditional /bin/mail contracted form, e.g. `d*' or `p4'. */ - + char *p; - + for (p = argv[0] + strlen (argv[0]) - 1; p > argv[0] && !mu_isalpha (*p); p--) ; p++; - + if (strlen (p)) { /* Expand contracted form. That's what we have kept an extra @@ -131,10 +131,10 @@ util_do_command (const char *fmt, ...) ws.ws_wordc++; ws.ws_offs = 0; } - + entry = mail_find_command (argv[0]); } - + if (entry) { /* Make sure we are not in any if/else */ @@ -183,12 +183,12 @@ util_foreach_msg (int argc, char **argv, int flags, } size_t -util_range_msg (size_t low, size_t high, int flags, +util_range_msg (size_t low, size_t high, int flags, msg_handler_t func, void *data) { msgset_t msgspec = { 0 }; size_t count, expect_count; - + msgspec.next = NULL; msgspec.npart = 0; msgspec.msg_part = &low; @@ -217,7 +217,7 @@ util_range_msg (size_t low, size_t high, int flags, (unsigned long) low); continue; } - + if (util_get_message (mbox, low, &mesg) == 0) { count ++; @@ -250,13 +250,13 @@ util_find_entry (void *table, size_t nmemb, size_t size, const char *cmd) int i; int len = strlen (cmd); char *p; - + for (p = table, i = 0; i < nmemb; i++, p += size) { struct mail_command *cp = (struct mail_command *)p; int ll = strlen (cp->longname); int sl = strlen (cp->shortname); - + if (sl > ll && !strncmp (cp->shortname, cmd, sl)) return p; else if (sl == len && !strcmp (cp->shortname, cmd)) @@ -285,7 +285,7 @@ util_help (void *table, size_t nmemb, size_t size, const char *word) continue; mu_stream_printf (out, "%s\n", cp->synopsis); } - + mu_stream_unref (out); return 0; @@ -313,7 +313,7 @@ util_command_list (void *table, size_t nmemb, size_t size) char *p; int cols = util_screen_columns (); int pos = 0; - + for (p = table, i = 0; i < nmemb; i++, p += size) { const char *cmd; @@ -335,7 +335,7 @@ util_command_list (void *table, size_t nmemb, size_t size) mu_printf ("\n%s ", cmd); } else - mu_printf ("%s ", cmd); + mu_printf ("%s ", cmd); } mu_printf ("\n"); return 0; @@ -467,35 +467,21 @@ char * util_folder_path (const char *name) { char *folder; - char *tmp; - char *p; - + int rc; + if (mailvar_get (&folder, "folder", mailvar_type_string, 1)) return NULL; - + if (!name) return NULL; - if (name[0] == '+') - name++; - - if (folder[0] != '/' && folder[0] != '~') - { - char *home = mu_get_homedir (); - tmp = mu_alloc (strlen (home) + 1 + - strlen (folder) + 1 + - strlen (name) + 1); - sprintf (tmp, "%s/%s/%s", home, folder, name); - } - else + + rc = mu_mailbox_expand_name (name, &folder); + if (rc) { - tmp = mu_alloc (strlen (folder) + 1 + - strlen (name) + 1); - sprintf (tmp, "%s/%s", folder, name); + mu_diag_funcall (MU_DIAG_ERROR, "mailbox_expand_name", name, rc); + return NULL; } - p = util_fullpath (tmp); - free (tmp); - - return p; + return folder; } char * @@ -504,7 +490,7 @@ util_get_sender (int msgno, int strip) mu_message_t msg = NULL; mu_address_t addr = NULL; char *buf = NULL, *p; - + mu_mailbox_get_message (mbox, msgno, &msg); addr = get_sender_address (msg); if (!addr) @@ -659,34 +645,43 @@ char * util_outfolder_name (char *str) { char *outfolder; + char *exp; + int rc; if (!str) return NULL; - + switch (*str) { case '/': case '~': - str = util_fullpath (str); - break; - case '+': - str = util_folder_path (str); + rc = mu_mailbox_expand_name (str, &exp); + if (rc) + { + mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_expand_name", str, rc); + return NULL; + } break; default: if (mailvar_get (&outfolder, "outfolder", mailvar_type_string, 0) == 0) { - char *ns = NULL; - mu_asprintf (&ns, "%s/%s", outfolder, str); - str = util_fullpath (ns); - free (ns); + char *s = mu_make_file_name (outfolder, str); + rc = mu_mailbox_expand_name (s, &exp); + if (rc) + { + mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_expand_name", s, rc); + free (s); + return NULL; + } + free (s); } break; } - return mu_strdup (str); + return exp; } /* Save an outgoing message. The SAVEFILE argument overrides the setting @@ -695,7 +690,7 @@ void util_save_outgoing (mu_message_t msg, char *savefile) { char *record; - + if (mailvar_get (&record, "record", mailvar_type_string, 0) == 0) { int rc; @@ -725,7 +720,7 @@ util_save_outgoing (mu_message_t msg, char *savefile) mu_mailbox_close (outbox); mu_mailbox_destroy (&outbox); - + free (filename); } } @@ -836,7 +831,7 @@ util_merge_addresses (char **addr_str, const char *value) if ((rc = mu_address_create (&new_addr, value)) != 0) return rc; - + if ((rc = mu_address_create (&addr, *addr_str)) != 0) { mu_address_destroy (&new_addr); @@ -847,7 +842,7 @@ util_merge_addresses (char **addr_str, const char *value) if (rc == 0) { char *val; - + rc = mu_address_aget_printable (addr, &val); if (rc == 0) { @@ -873,7 +868,7 @@ is_address_field (const char *name) 0 }; char **p; - + for (p = address_fields; *p; p++) if (mu_c_strcasecmp (*p, name) == 0) return 1; @@ -886,32 +881,32 @@ util_header_expand (mu_header_t *phdr) size_t i, nfields = 0; mu_header_t hdr; int errcnt = 0, rc; - + rc = mu_header_create (&hdr, "", 0); if (rc) { mu_error (_("Cannot create temporary header: %s"), mu_strerror (rc)); return 1; } - + mu_header_get_field_count (*phdr, &nfields); for (i = 1; i <= nfields; i++) { const char *name, *value; - + if (mu_header_sget_field_name (*phdr, i, &name)) continue; if (mu_header_sget_field_value (*phdr, i, &value)) continue; - + if (is_address_field (name)) { const char *s; mu_address_t addr = NULL; struct mu_wordsplit ws; size_t j; - + if (mu_header_sget_value (hdr, name, &s) == 0) mu_address_create (&addr, s); @@ -932,9 +927,9 @@ util_header_expand (mu_header_t *phdr) const char *exp; mu_address_t new_addr; char *p = ws.ws_wordv[j]; - + if (mailvar_is_true ("inplacealiases")) - /* If inplacealiases was set, the value was already expanded */ + /* If inplacealiases was set, the value was already expanded */ exp = p; else exp = alias_expand (p); @@ -949,15 +944,15 @@ util_header_expand (mu_header_t *phdr) mu_error (_("Cannot parse address `%s': %s"), p, mu_strerror (rc)); } - + mu_address_union (&addr, new_addr); mu_address_destroy (&new_addr); } - + if (addr) { const char *newvalue; - + rc = mu_address_sget_printable (addr, &newvalue); if (rc == 0 && newvalue) mu_header_set_value (hdr, name, newvalue, 1); @@ -989,7 +984,7 @@ util_get_message (mu_mailbox_t mbox, size_t msgno, mu_message_t *msg) util_error_range (msgno); return MU_ERR_NOENT; } - + status = mu_mailbox_get_message (mbox, msgno, msg); if (status) { @@ -1060,7 +1055,7 @@ util_get_charset (void) char *tmp = getenv ("LC_ALL"); if (!tmp) tmp = getenv ("LANG"); - + if (tmp && mu_parse_lc_all (tmp, &lc_all, MU_LC_CSET) == 0) { charset = mu_strdup (lc_all.charset); @@ -1089,7 +1084,7 @@ util_rfc2047_decode (char **value) rc = mu_rfc2047_decode (charset, *value, &tmp); free (charset); - + if (rc) { if (mailvar_is_true ("verbose")) @@ -1124,7 +1119,7 @@ open_pager (size_t lines) const char *pager; unsigned pagelines = util_get_crt (); mu_stream_t str; - + if (pagelines && lines > pagelines && (pager = getenv ("PAGER"))) { int rc = mu_command_stream_create (&str, pager, MU_STREAM_WRITE); |