A read-eval loop function shared between mail.c and

source.c. Quits gracefully upon reading EOF.
Expand '~' in pathnames.
Upon startup in read mode, display first screenfull of from
lines, instead of listing the whole mailbox. This is
compatible with existing implementations.
Do not display prompt when stdin is not a terminal.

@@ -125,10 +125,20 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 
 static struct argp argp = { options, parse_opt, args_doc, doc };
 static struct argp argp = { options, parse_opt, args_doc, doc };
 
 
+static char *
+mail_cmdline(void *closure, int cont)
+{
+  struct mail_env_entry *pev = closure;
+  char *prompt = NULL;
+
+  if (mail_is_terminal())
+    prompt = pev->set && pev->value != NULL ? pev->value : "? ";
+  return readline (prompt);
+}
+
 int
 int
 main (int argc, char **argv)
 main (int argc, char **argv)
 {
 {
-  char *command = NULL, *cmd = NULL;
   struct mail_env_entry *mode = NULL, *prompt = NULL;
   struct mail_env_entry *mode = NULL, *prompt = NULL;
   int modelen = 0;
   int modelen = 0;
   struct arguments args;
   struct arguments args;
@@ -153,12 +163,15 @@ main (int argc, char **argv)
 
 
   /* set up the default environment */
   /* set up the default environment */
   if (!getenv ("HOME"))
   if (!getenv ("HOME"))
-    exit (1);			/* FIXME: how to start with no $HOME ?  */
-  setenv ("DEAD", "~/dead.letter", 0); /* FIXME: expand ~ */
+    {
+      char *p = util_get_homedir();
+      setenv ("HOME", p, 0);
+    }
+  setenv ("DEAD", util_fullpath("~/dead.letter"), 0); 
   setenv ("EDITOR", "ed", 0);
   setenv ("EDITOR", "ed", 0);
   setenv ("LISTER", "ls", 0);
   setenv ("LISTER", "ls", 0);
-  setenv ("MAILRC", "~/.mailrc", 0); /* FIXME: expand ~ */
-  setenv ("MBOX", "~/mbox", 0);	/* FIXME: expand ~ */
+  setenv ("MAILRC", util_fullpath("~/.mailrc"), 0);
+  setenv ("MBOX", util_fullpath("~/mbox"), 0);	
   setenv ("PAGER", "more", 0);
   setenv ("PAGER", "more", 0);
   setenv ("SHELL", "sh", 0);
   setenv ("SHELL", "sh", 0);
   setenv ("VISUAL", "vi", 0);
   setenv ("VISUAL", "vi", 0);
@@ -267,7 +280,7 @@ main (int argc, char **argv)
       else if (mailbox_create (&mbox, args.file) != 0)
       else if (mailbox_create (&mbox, args.file) != 0)
 	exit (EXIT_FAILURE);
 	exit (EXIT_FAILURE);
 
 
-      if (mailbox_open (mbox, MU_STREAM_READ) != 0)
+      if (mailbox_open (mbox, MU_STREAM_RDWR) != 0)
 	exit (EXIT_FAILURE);
 	exit (EXIT_FAILURE);
 
 
       if (mailbox_messages_count (mbox, &total) != 0)
       if (mailbox_messages_count (mbox, &total) != 0)
@@ -283,23 +296,37 @@ main (int argc, char **argv)
 
 
       /* initial commands */
       /* initial commands */
       if ((util_find_env("header"))->set)
       if ((util_find_env("header"))->set)
-	util_do_command ("from *");
+	  util_do_command ("z.");
 
 
       prompt = util_find_env ("prompt");
       prompt = util_find_env ("prompt");
+      mail_set_is_terminal(isatty(0));
+      mail_mainloop(mail_cmdline, (void*) prompt, 1);
+      fprintf (ofile, "\n");
+      util_do_command ("quit");
+      return 0;
+    }
+  /* We should never reach this point */
+  return 1;
+}
+
 
 
-      while (1)
+void
+mail_mainloop(char *(*input) __P((void *, int)), void *closure, int do_history)
+{
+  char *command, *cmd;
+  while ((command = (*input)(closure, 0)) != NULL)
     {
     {
-	  int len;
-	  if (command)
-	    free (command);
-	  command = readline (prompt->set && prompt->value != NULL
-			      ? prompt->value : "? ");
-	  len = strlen (command);
+      int len = strlen (command);
       while (command[len-1] == '\\')
       while (command[len-1] == '\\')
 	{
 	{
 	  char *buf;
 	  char *buf;
-	      char *command2 = readline ("> ");
+	  char *command2 = (*input) (closure, 1);
 
 
+	  if (!command2)
+	    {
+	      command[len-1] = 0;
+	      break;
+	    }
 	  command[len-1] = '\0';
 	  command[len-1] = '\0';
 	  buf = malloc ((len + strlen (command2)) * sizeof (char));
 	  buf = malloc ((len + strlen (command2)) * sizeof (char));
 	  strcpy (buf, command);
 	  strcpy (buf, command);
@@ -311,10 +338,14 @@ main (int argc, char **argv)
       cmd = util_stripwhite (command);
       cmd = util_stripwhite (command);
       util_do_command (cmd);
       util_do_command (cmd);
 #ifdef WITH_READLINE
 #ifdef WITH_READLINE
+      if (do_history)
 	add_history (cmd);
 	add_history (cmd);
 #endif
 #endif
+      if (command)
+	free (command);
     }
     }
-    }
-  /* We should never reach this point */
-  return 1;
 }  
 }  
+  
+
+
+