summaryrefslogtreecommitdiff
path: root/mail/cd.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-01-21 07:17:56 +0200
committerSergey Poznyakoff <gray@gnu.org>2019-01-21 10:31:37 +0200
commitdb7165424199a473265eda5d35f2399e8816e92d (patch)
treec55a57f21f540c45b93f60543bca8bbb24b9bc3a /mail/cd.c
parent29a837b1126c701191affceb092afbb8de5d5ffc (diff)
downloadmailutils-db7165424199a473265eda5d35f2399e8816e92d.tar.gz
mailutils-db7165424199a473265eda5d35f2399e8816e92d.tar.bz2
Improve folder handling and expansion in mail. Add convenience functions to the library.
* configure.ac: Build libmailutils/wicket * libmailutils/Makefile.am: Likewise. * libmailutils/base/wicket.c: Move file wicket stuff to ... * libmailutils/wicket/file.c: ... here * libmailutils/wicket/noauth.c: New file. * libmailutils/wicket/Makefile.am: New file. * include/mailutils/auth.h (mu_noauth_ticket_create) (mu_noauth_wicket_create): New protos. * include/mailutils/folder.h (mu_folder_attach_ticket) (mu_folder_is_local): New protos. * include/mailutils/mailbox.h (mu_mailbox_attach_ticket): New proto. * include/mailutils/sys/folder.h (_mu_folder): Remove flags. Add new member: is_local. * libmailutils/mailbox/folder.c (mu_folder_create_from_record): Set is_local. (mu_folder_attach_ticket): New function. (mu_folder_is_local): New function. * libmailutils/mailbox/mbx_default.c (mu_mailbox_attach_ticket): New function. * libmailutils/url/create.c: Allow for trailing / in url. * libproto/imap/mbox.c (_imap_mbx_open): Do initial scan. (__imap_msg_get_stream): Initialize clos.size. * libproto/imap/tests/imapfolder.c: Attach ticket to the folder. * mail/cd.c (mail_cd): Expand directory name (~, %, + notations) prior to use. * mail/file.c (mail_file): Attach ticket to the mailbox. * mail/copy.c (append_to_mailbox): Likewise. * mail/mailline.c: Rewrite directory expansion. Implement fully functional folder expansion. * mail/util.c (util_folder_path) (util_outfolder_name): Rewrite using mu_mailbox_expand_name.
Diffstat (limited to 'mail/cd.c')
-rw-r--r--mail/cd.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/mail/cd.c b/mail/cd.c
index cb71b4c90..122a1af1f 100644
--- a/mail/cd.c
+++ b/mail/cd.c
@@ -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;
}

Return to:

Send suggestions and report system problems to the System administrator.