/* movemail foo bar -- move file foo to file bar,
locking file foo the way /bin/mail respects.
- Copyright (C) 1986, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1986, 92, 93, 94, 96, 1999 Free Software Foundation, Inc.
This file is part of GNU Emacs.
*/
#define NO_SHORTNAMES /* Tell config not to load remap.h */
-#include <../src/config.h>
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <stdio.h>
#include <errno.h>
-#include <../src/syswait.h>
+
#include <getopt.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#include "syswait.h"
#ifdef MAIL_USE_POP
#include "pop.h"
#endif
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>
#ifndef F_OK
#define F_OK 0
#define X_OK 1
#define W_OK 2
#define R_OK 4
#endif
-#endif /* USG */
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#endif
#if defined (XENIX) || defined (WINDOWSNT)
#include <sys/locking.h>
extern int errno;
#endif
char *strerror ();
-extern char *rindex ();
+#ifdef HAVE_INDEX
+extern char *index __P ((const char *, int));
+#endif
+#ifdef HAVE_RINDEX
+extern char *rindex __P((const char *, int));
+#endif
void fatal ();
void error ();
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 */
+
+#ifdef WINDOWSNT
+ /* Ensure all file i/o is in binary mode. */
+ _fmode = _O_BINARY;
+#endif
+
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;
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);
}
if (desc < 0)
{
char *message = (char *) xmalloc (strlen (tempname) + 50);
- sprintf (message, "%s--see source file lib-src/movemail.c",
+ sprintf (message, "creating %s, which would become the lock file",
tempname);
pfatal_with_name (message);
}
#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));
{
if (delete_lockname)
unlink (delete_lockname);
- error (s1, s2);
+ error (s1, s2, 0);
exit (1);
}
-/* Print error message. `s1' is printf control string, `s2' is arg for it. */
+/* Print error message. `s1' is printf control string, `s2' and `s3'
+ are args for it or null. */
void
error (s1, s2, s3)
char *s1, *s2, *s3;
{
fprintf (stderr, "movemail: ");
- fprintf (stderr, s1, s2, s3);
+ if (s3)
+ fprintf (stderr, s1, s2, s3);
+ else if (s2)
+ fprintf (stderr, s1, s2);
+ else
+ fprintf (stderr, s1);
fprintf (stderr, "\n");
}
FILE *sfo;
char ibuffer[BUFSIZ];
char obuffer[BUFSIZ];
-char Errmsg[80];
+char Errmsg[200]; /* POP errors, at least, can exceed
+ the original length of 80. */
-popmail (user, outfile, preserve, password)
- char *user;
+/*
+ * The full legal syntax for a POP mailbox specification for movemail
+ * is "po:username:hostname". The ":hostname" is optional; if it is
+ * omitted, the MAILHOST environment variable will be consulted. Note
+ * that by the time popmail() is called the "po:" has been stripped
+ * off of the front of the mailbox name.
+ *
+ * If the mailbox is in the form "po:username:hostname", then it is
+ * modified by this function -- the second colon is replaced by a
+ * null.
+ */
+
+int
+popmail (mailbox, outfile, preserve, password, reverse_order)
+ char *mailbox;
char *outfile;
int preserve;
char *password;
+ int reverse_order;
{
int nmsgs, nbytes;
register int i;
FILE *mbf;
char *getenv ();
popserver server;
+ int start, end, increment;
+ char *user, *hostname;
+
+ user = mailbox;
+ if ((hostname = index(mailbox, ':')))
+ *hostname++ = '\0';
- server = pop_open (0, user, password, POP_NO_GETPASS);
+ server = pop_open (hostname, user, password, POP_NO_GETPASS);
if (! server)
{
- error (pop_error);
+ error ("Error connecting to POP server: %s", pop_error, 0);
return (1);
}
if (pop_stat (server, &nmsgs, &nbytes))
{
- error (pop_error);
+ error ("Error getting message count from POP server: %s", pop_error, 0);
return (1);
}
if ((mbf = fdopen (mbfi, "wb")) == NULL)
{
pop_close (server);
- error ("Error in fdopen: %s", strerror (errno));
+ error ("Error in fdopen: %s", strerror (errno), 0);
close (mbfi);
unlink (outfile);
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)
{
- error (Errmsg);
+ error (Errmsg, 0, 0);
close (mbfi);
return (1);
}
fflush (mbf);
if (ferror (mbf))
{
- error ("Error in fflush: %s", strerror (errno));
+ error ("Error in fflush: %s", strerror (errno), 0);
pop_close (server);
close (mbfi);
return (1);
#ifdef BSD_SYSTEM
if (fsync (mbfi) < 0)
{
- error ("Error in fsync: %s", strerror (errno));
+ error ("Error in fsync: %s", strerror (errno), 0);
return (1);
}
#endif
if (close (mbfi) == -1)
{
- error ("Error in close: %s", strerror (errno));
+ error ("Error in close: %s", strerror (errno), 0);
return (1);
}
{
if (pop_delete (server, i))
{
- error (pop_error);
+ error ("Error from POP server: %s", pop_error, 0);
pop_close (server);
return (1);
}
if (pop_quit (server))
{
- error (pop_error);
+ error ("Error from POP server: %s", pop_error, 0);
return (1);
}
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);
}
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);
}
return (OK);
}
+int
mbx_delimit_end (mbf)
FILE *mbf;
{
HCoop / bpt / emacs.git / blobdiff