summaryrefslogtreecommitdiff
path: root/guimb/collect.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2002-01-21 06:23:15 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2002-01-21 06:23:15 +0000
commit417d4307c6a76d178a13eb29a16c8972b3b7ee8f (patch)
tree909060087719038bd418603573fbdf705fcd00f9 /guimb/collect.c
parent02c6f21ad6c94a6ff96f55de2403db6e52813060 (diff)
downloadmailutils-417d4307c6a76d178a13eb29a16c8972b3b7ee8f.tar.gz
mailutils-417d4307c6a76d178a13eb29a16c8972b3b7ee8f.tar.bz2
Use MU_PATH_MAILDIR.
Diffstat (limited to 'guimb/collect.c')
-rw-r--r--guimb/collect.c45
1 files changed, 25 insertions, 20 deletions
diff --git a/guimb/collect.c b/guimb/collect.c
index 15f95a560..29857837d 100644
--- a/guimb/collect.c
+++ b/guimb/collect.c
@@ -16,13 +16,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "guimb.h"
-#ifdef HAVE_PATHS_H
-# include <paths.h>
-#endif
-
-#ifndef _PATH_MAILDIR
-# define _PATH_MAILDIR "/var/spool/mail"
-#endif
char *temp_filename;
FILE *temp_file;
@@ -32,7 +25,16 @@ void
collect_open_default ()
{
size_t nmesg;
-
+
+ if (!default_mailbox)
+ {
+ asprintf (&default_mailbox, "%s%s", maildir, user_name);
+ if (!default_mailbox)
+ {
+ util_error ("not enough memory");
+ exit (1);
+ }
+ }
if (mailbox_create (&mbox, default_mailbox) != 0
|| mailbox_open (mbox, MU_STREAM_RDWR) != 0)
{
@@ -137,18 +139,6 @@ collect_output ()
return 0;
}
- if (!default_mailbox)
- {
- if (!user_name)
- return 0;
- asprintf (&default_mailbox, "%s/%s", _PATH_MAILDIR, user_name);
- if (!default_mailbox)
- {
- fprintf (stderr, "guimb: not enough memory\n");
- return 1;
- }
- }
-
if (user_name)
saved_umask = umask (077);
@@ -197,3 +187,18 @@ collect_drop_mailbox ()
free (temp_filename);
}
}
+
+int
+guimb_catch_handler (void *unused, SCM tag, SCM throw_args)
+{
+ collect_drop_mailbox ();
+ return scm_handle_by_message ("guimb", tag, throw_args);
+}
+
+int
+guimb_exit (void *unused1, mailbox_t unused2)
+{
+ int rc = collect_output ();
+ collect_drop_mailbox ();
+ return rc;
+}

Return to:

Send suggestions and report system problems to the System administrator.