X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d89d0243979a85456895e72e658116b760527bdc..efa2a55cbd069dc74315ca7b4c6a9d3244a70df4:/lib-src/movemail.c

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index e010d6f980..85a28615e4 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -79,18 +79,33 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #ifdef WINDOWSNT
+#include "ntlib.h"
 #undef access
 #undef unlink
 #define fork() 0
-#define sys_wait(var) (*(var) = 0)
+#define wait(var) (*(var) = 0)
 /* Unfortunately, Samba doesn't seem to properly lock Unix files even
    though the locking call succeeds (and indeed blocks local access from
    other NT programs).  If you have direct file access using an NFS
    client or something other than Samba, the locking call might work
-   properly - make sure it does before you enable this! */
-#define DISABLE_DIRECT_ACCESS
+   properly - make sure it does before you enable this!
+
+   [18-Feb-97 andrewi] I now believe my comment above to be incorrect,
+   since it was based on a misunderstanding of how locking calls are
+   implemented and used on Unix.  */
+//#define DISABLE_DIRECT_ACCESS
+
+/* Ensure all file i/o is in binary mode. */
+#include <fcntl.h>
+int _fmode = _O_BINARY;
 #endif /* WINDOWSNT */
 
+/* Cancel substitutions made by config.h for Emacs.  */
+#undef open
+#undef read
+#undef write
+#undef close
+
 #ifdef USG
 #include <fcntl.h>
 #include <unistd.h>
@@ -106,6 +121,10 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
+
 #if defined (XENIX) || defined (WINDOWSNT)
 #include <sys/locking.h>
 #endif
@@ -133,12 +152,6 @@ static char *mail_spool_name ();
 #endif
 #endif
 
-/* Cancel substitutions made by config.h for Emacs.  */
-#undef open
-#undef read
-#undef write
-#undef close
-
 #ifndef errno
 extern int errno;
 #endif
@@ -184,11 +197,23 @@ main (argc, argv)
   char *spool_name;
 #endif
 
+#ifdef MAIL_USE_POP
+  int pop_reverse_order = 0;
+# define ARGSTR "pr"
+#else /* ! MAIL_USE_POP */
+# define ARGSTR "p"
+#endif /* MAIL_USE_POP */
+
   delete_lockname = 0;
 
-  while ((c = getopt (argc, argv, "p")) != EOF)
+  while ((c = getopt (argc, argv, ARGSTR)) != EOF)
     {
       switch (c) {
+#ifdef MAIL_USE_POP
+      case 'r':
+	pop_reverse_order = 1;
+	break;
+#endif
       case 'p':
 	preserve_mail++;
 	break;
@@ -250,7 +275,8 @@ main (argc, argv)
       int status;
 
       status = popmail (inname + 3, outname, preserve_mail,
-			(argc - optind == 3) ? argv[optind+2] : NULL);
+			(argc - optind == 3) ? argv[optind+2] : NULL,
+			pop_reverse_order);
       exit (status);
     }
 
@@ -477,14 +503,14 @@ main (argc, argv)
 #ifdef MAIL_USE_SYSTEM_LOCK
       if (! preserve_mail)
 	{
-#if defined (STRIDE) || defined (XENIX) || defined (WINDOWSNT)
+#if defined (STRIDE) || defined (XENIX)
 	  /* Stride, xenix have file locking, but no ftruncate.
 	     This mess will do. */
 	  close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666));
 #else
 	  ftruncate (indesc, 0L);
-	}
 #endif /* STRIDE or XENIX */
+	}
 #endif /* MAIL_USE_SYSTEM_LOCK */
 
 #ifdef MAIL_USE_MMDF
@@ -669,11 +695,12 @@ char ibuffer[BUFSIZ];
 char obuffer[BUFSIZ];
 char Errmsg[80];
 
-popmail (user, outfile, preserve, password)
+popmail (user, outfile, preserve, password, reverse_order)
      char *user;
      char *outfile;
      int preserve;
      char *password;
+     int reverse_order;
 {
   int nmsgs, nbytes;
   register int i;
@@ -681,17 +708,18 @@ popmail (user, outfile, preserve, password)
   FILE *mbf;
   char *getenv ();
   popserver server;
+  int start, end, increment;
 
   server = pop_open (0, user, password, POP_NO_GETPASS);
   if (! server)
     {
-      error (pop_error);
+      error ("Error connecting to POP server: %s", pop_error);
       return (1);
     }
 
   if (pop_stat (server, &nmsgs, &nbytes))
     {
-      error (pop_error);
+      error ("Error getting message count from POP server: %s", pop_error);
       return (1);
     }
 
@@ -719,7 +747,20 @@ popmail (user, outfile, preserve, password)
       return (1);
     }
 
-  for (i = 1; i <= nmsgs; i++)
+  if (reverse_order)
+    {
+      start = nmsgs;
+      end = 1;
+      increment = -1;
+    }
+  else
+    {
+      start = 1;
+      end = nmsgs;
+      increment = 1;
+    }
+
+  for (i = start; i * increment <= end * increment; i += increment)
     {
       mbx_delimit_begin (mbf);
       if (pop_retr (server, i, mbf) != OK)
@@ -764,7 +805,7 @@ popmail (user, outfile, preserve, password)
       {
 	if (pop_delete (server, i))
 	  {
-	    error (pop_error);
+	    error ("Error from POP server: %s", pop_error);
 	    pop_close (server);
 	    return (1);
 	  }
@@ -772,7 +813,7 @@ popmail (user, outfile, preserve, password)
 
   if (pop_quit (server))
     {
-      error (pop_error);
+      error ("Error from POP server: %s", pop_error);
       return (1);
     }
     
@@ -790,8 +831,10 @@ pop_retr (server, msgno, arg)
 
   if (pop_retrieve_first (server, msgno, &line))
     {
-      strncpy (Errmsg, pop_error, sizeof (Errmsg));
+      char *error = concat ("Error from POP server: ", pop_error, "");
+      strncpy (Errmsg, error, sizeof (Errmsg));
       Errmsg[sizeof (Errmsg)-1] = '\0';
+      free(error);
       return (NOTOK);
     }
 
@@ -810,8 +853,10 @@ pop_retr (server, msgno, arg)
 
   if (ret)
     {
-      strncpy (Errmsg, pop_error, sizeof (Errmsg));
+      char *error = concat ("Error from POP server: ", pop_error, "");
+      strncpy (Errmsg, error, sizeof (Errmsg));
       Errmsg[sizeof (Errmsg)-1] = '\0';
+      free(error);
       return (NOTOK);
     }