Handle draft file. Added --use option.

@@ -18,6 +18,8 @@
 /* MH reply command */
 /* MH reply command */
 
 
 #include <mh.h>
 #include <mh.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 
 const char *argp_program_version = "reply (" PACKAGE_STRING ")";
 const char *argp_program_version = "reply (" PACKAGE_STRING ")";
 static char doc[] = "GNU MH reply";
 static char doc[] = "GNU MH reply";
@@ -62,6 +64,7 @@ static struct argp_option options[] = {
   {"width", 'w', N_("NUMBER"), 0, N_("Set output width")},
   {"width", 'w', N_("NUMBER"), 0, N_("Set output width")},
   {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
   {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
    N_("Set the replacement for whatnow program")},
    N_("Set the replacement for whatnow program")},
+  {"use", 'u', NULL, 0, N_("Use draft file preserved after the last session") },
   { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
   { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
   { 0 }
   { 0 }
 };
 };
@@ -108,6 +111,7 @@ static mh_msgset_t msgset;
 static mailbox_t mbox;
 static mailbox_t mbox;
 static int build_only = 0; /* --build flag */
 static int build_only = 0; /* --build flag */
 static int query_mode = 0; /* --query flag */
 static int query_mode = 0; /* --query flag */
+static int use_draft = 0;  /* --use flag */
 
 
 static int
 static int
 decode_cc_flag (const char *opt, const char *arg)
 decode_cc_flag (const char *opt, const char *arg)
@@ -164,6 +168,10 @@ opt_handler (int key, char *arg, void *unused)
       wh_env.draftmessage = arg;
       wh_env.draftmessage = arg;
       break;
       break;
 
 
+    case 'u':
+      use_draft++;
+      break;
+      
     case 'w':
     case 'w':
       width = strtoul (arg, NULL, 0);
       width = strtoul (arg, NULL, 0);
       if (!width)
       if (!width)
@@ -204,19 +212,38 @@ make_draft ()
 {
 {
   int rc;
   int rc;
   message_t msg;
   message_t msg;
-  FILE *fp;
-  char buffer[1024];
-#define bufsize sizeof(buffer)
+  int disp = DISP_REPLACE;
+  struct stat st;
   
   
-  /* FIXME: first check if the draft exists */
-  fp = fopen (wh_env.file, "w+");
-  if (!fp)
+  /* First check if the draft exists */
+  if (stat (wh_env.draftfile, &st) == 0)
     {
     {
-      mh_error (_("cannot open draft file %s: %s"),
-		wh_env.file, strerror (errno));
-      exit (1);
+      if (use_draft)
+	disp = DISP_USE;
+      else
+	{
+	  printf (_("Draft \"%s\" exists (%lu bytes).\n"),
+		  wh_env.draftfile, (unsigned long) st.st_size);
+	  disp = mh_disposition (wh_env.draftfile);
+	}
+    }
+
+  switch (disp)
+    {
+    case DISP_QUIT:
+      exit (0);
+
+    case DISP_USE:
+      unlink (wh_env.file);
+      rename (wh_env.draftfile, wh_env.file);
+      break;
+	  
+    case DISP_REPLACE:
+      unlink (wh_env.draftfile);
+      break;  
     }
     }
 
 
+  
   rc = mailbox_get_message (mbox, msgset.list[0], &msg);
   rc = mailbox_get_message (mbox, msgset.list[0], &msg);
   if (rc)
   if (rc)
     {
     {
@@ -226,9 +253,22 @@ make_draft ()
       exit (1);
       exit (1);
     }
     }
 
 
+  if (disp == DISP_REPLACE)
+    {
+      FILE *fp = fopen (wh_env.file, "w+");
+      char buffer[1024];
+#define bufsize sizeof(buffer)
+
+      if (!fp)
+	{
+	  mh_error (_("cannot open draft file %s: %s"),
+		    wh_env.file, strerror (errno));
+	  exit (1);
+	}
       mh_format (&format, msg, msgset.list[0], buffer, bufsize);
       mh_format (&format, msg, msgset.list[0], buffer, bufsize);
       fprintf (fp, "%s", buffer);
       fprintf (fp, "%s", buffer);
       fclose (fp);
       fclose (fp);
+    }
 
 
   {
   {
     url_t url;
     url_t url;
@@ -278,6 +318,7 @@ main (int argc, char **argv)
     }
     }
   
   
   wh_env.file = mh_expand_name (wh_env.draftfolder, "reply", 0);
   wh_env.file = mh_expand_name (wh_env.draftfolder, "reply", 0);
+  wh_env.draftfile = mh_expand_name (wh_env.draftfolder, "draft", 0);
 
 
   make_draft ();
   make_draft ();