Implemented "set ignore", "set ignoreeof", "set nosave".

Implemented using doubled escape character to insert a single escape
into the message body.

@@ -120,20 +120,40 @@ mail_send0 (struct send_environ *env, int save_to)
       
       
       if (ml_got_interrupt())
       if (ml_got_interrupt())
 	{
 	{
+	  if (util_find_env("ignore")->set)
+	    {
+	      fprintf (stdout, "@\n");
+	    }
+	  else
+	    {
 	      if (++int_cnt == 2)
 	      if (++int_cnt == 2)
 		break;
 		break;
 	      util_error("(Interrupt -- one more to kill letter)");
 	      util_error("(Interrupt -- one more to kill letter)");
 	      if (buf)
 	      if (buf)
 		free (buf);
 		free (buf);
+	    }
 	  continue;
 	  continue;
 	}
 	}
 
 
       if (!buf)
       if (!buf)
+	{
+	  if (util_find_env ("ignoreeof")->set)
+	    {
+	      util_error ("Use \".\" to terminate letter.");
+	      continue;
+	    }
+	  else
 	    break;
 	    break;
+	}
+      
       int_cnt = 0;
       int_cnt = 0;
       
       
       if (buf[0] == (util_find_env("escape"))->value[0])
       if (buf[0] == (util_find_env("escape"))->value[0])
 	{
 	{
+	  if (buf[1] == buf[0])
+	    fprintf (env->file, "%s\n", buf+1);
+	  else
+	    {
 	      int argc;
 	      int argc;
 	      char **argv;
 	      char **argv;
 	      int status;
 	      int status;
@@ -158,20 +178,43 @@ mail_send0 (struct send_environ *env, int save_to)
 	      
 	      
 	      ofile =  env->ofile;
 	      ofile =  env->ofile;
 	    }
 	    }
+	}
       else
       else
-	fprintf (env->file, "%s", buf);
+	fprintf (env->file, "%s\n", buf);
       fflush (env->file);
       fflush (env->file);
       free (buf); 
       free (buf); 
     }
     }
 
 
-  fclose (env->file);
   if (int_cnt)
   if (int_cnt)
     {
     {
+      if (util_find_env ("save")->set)
+	{
+	  FILE *fp = fopen (getenv("DEAD"), "a");
+
+	  if (!fp)
+	    {
+	      util_error("can't open file %s: %s", getenv("DEAD"),
+			 strerror(errno));
+	    }
+	  else
+	    {
+	      char *buf = NULL;
+	      int n;
+	      rewind (env->file);
+	      while (getline (&buf, &n, env->file) > 0)
+		fputs(buf, fp);
+	      fclose(fp);
+	    }
+	}
+	      
+      fclose (env->file);
       remove (filename);
       remove (filename);
       free (filename);
       free (filename);
       return 1;
       return 1;
     }
     }
 
 
+  fclose (env->file); /*FIXME: freopen would be better*/
+  
   file = fopen (filename, "r");
   file = fopen (filename, "r");
   if (file != NULL)
   if (file != NULL)
     {
     {
@@ -203,6 +246,7 @@ mail_send0 (struct send_environ *env, int save_to)
 	  header_set_value (header, MU_HEADER_BCC , strdup (env->bcc), 0);
 	  header_set_value (header, MU_HEADER_BCC , strdup (env->bcc), 0);
 	if (env->subj && *env->subj != '\0')
 	if (env->subj && *env->subj != '\0')
 	  header_set_value (header, MU_HEADER_SUBJECT, strdup (env->subj), 1);
 	  header_set_value (header, MU_HEADER_SUBJECT, strdup (env->subj), 1);
+	header_set_value (header, "X-Mailer", strdup (argp_program_version), 1);
       }
       }
 
 
       /* Fill the body.  */
       /* Fill the body.  */