summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2003-03-14 14:42:01 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2003-03-14 14:42:01 +0000
commit38426df01253601e0e6ce2d30fb16843b6d63c9b (patch)
treed442b7f0b8fdf639880981bb92528dcd7250ce51
parentac863ef5b3ee9df798c83f33a6fe5380dc20c467 (diff)
downloadmailutils-38426df01253601e0e6ce2d30fb16843b6d63c9b.tar.gz
mailutils-38426df01253601e0e6ce2d30fb16843b6d63c9b.tar.bz2
(format_str,check_draft_disposition): Removed
(main): Use mh_comp_draft().
-rw-r--r--mh/comp.c62
1 files changed, 2 insertions, 60 deletions
diff --git a/mh/comp.c b/mh/comp.c
index 3d8c65eaf..be80da259 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -71,12 +71,6 @@ struct mh_option mh_option[] = {
{ 0 }
};
-static char *format_str =
-"To:\n"
-"cc:\n"
-"Subject:\n"
-"--------\n";
-
struct mh_whatnow_env wh_env = { 0 };
const char *formfile;
static int initial_edit = 1;
@@ -139,28 +133,6 @@ opt_handler (int key, char *arg, void *unused, struct argp_state *state)
}
return 0;
}
-
-int
-check_draft_disposition (struct mh_whatnow_env *wh)
-{
- struct stat st;
- int disp = DISP_REPLACE;
-
- /* First check if the draft exists */
- if (stat (wh->draftfile, &st) == 0)
- {
- if (use_draft)
- disp = DISP_USE;
- else
- {
- printf (_("Draft \"%s\" exists (%lu bytes).\n"),
- wh->draftfile, (unsigned long) st.st_size);
- disp = mh_disposition (wh->draftfile);
- }
- }
-
- return disp;
-}
int
copy_message (mailbox_t mbox, size_t n, const char *file)
@@ -233,7 +205,7 @@ main (int argc, char **argv)
if (!wh_env.draftfile)
wh_env.draftfile = mh_expand_name (wh_env.draftfolder, "draft", 0);
- switch (check_draft_disposition (&wh_env))
+ switch (check_draft_disposition (&wh_env, use_draft))
{
case DISP_QUIT:
exit (0);
@@ -260,38 +232,8 @@ main (int argc, char **argv)
}
copy_message (mbox, msgset.list[0], wh_env.file);
}
- else if (formfile)
- {
- if (mh_file_copy (formfile, wh_env.file) == 0)
- exit (1);
- }
else
- {
- int rc;
- stream_t stream;
-
- if ((rc = file_stream_create (&stream,
- wh_env.file,
- MU_STREAM_WRITE|MU_STREAM_CREAT)) != 0
- || (rc = stream_open (stream)))
- {
- mh_error (_("cannot open output file \"%s\": %s"),
- wh_env.file, mu_strerror (rc));
- exit (1);
- }
-
- rc = stream_sequential_write (stream,
- format_str, strlen (format_str));
- stream_close (stream);
- stream_destroy (&stream, stream_get_owner (stream));
-
- if (rc)
- {
- mh_error (_("error writing to \"%s\": %s"),
- wh_env.file, mu_strerror (rc));
- exit (1);
- }
- }
+ mh_comp_draft (formfile, "components", wh_env.file);
}
/* Exit immediately if --build is given */

Return to:

Send suggestions and report system problems to the System administrator.