/* movemail foo bar -- move file foo to file bar,
locking file foo the way /bin/mail respects.
- Copyright (C) 1986 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+/* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
+ cause loss of mail* if you do it on a system that does not normally
+ use flock as its way of interlocking access to inbox files. The
+ setting of MAIL_USE_FLOCK and MAIL_USE_LOCKF *must agree* with the
+ system's own conventions. It is not a choice that is up to you.
+
+ So, if your system uses lock files rather than flock, then the only way
+ you can get proper operation is to enable movemail to write lockfiles there.
+ This means you must either give that directory access modes
+ that permit everyone to write lockfiles in it, or you must make movemail
+ a setuid or setgid program. */
/*
* Modified January, 1986 by Michael R. Gretzinger (Project Athena)
*
- * Added POP (Post Office Protocol) service. When compiled -DPOP
+ * Added POP (Post Office Protocol) service. When compiled -DMAIL_USE_POP
* movemail will accept input filename arguments of the form
* "po:username". This will cause movemail to open a connection to
* a pop server running on $MAILHOST (environment variable). Movemail
*
* New module: popmail.c
* Modified routines:
- * main - added code within #ifdef MAIL_USE_POP; added setuid(getuid())
+ * main - added code within #ifdef MAIL_USE_POP; added setuid (getuid ())
* after POP code.
* New routines in movemail.c:
* get_errmsg - return pointer to system error message
*
+ * Modified August, 1993 by Jonathan Kamens (OpenVision Technologies)
+ *
+ * Move all of the POP code into a separate file, "pop.c".
+ * Use strerror instead of get_errmsg.
+ *
*/
+#define NO_SHORTNAMES /* Tell config not to load remap.h */
+#include <../src/config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
+#include <stdio.h>
#include <errno.h>
-#define NO_SHORTNAMES /* Tell config not to load remap.h */
-#include "../src/config.h"
+#include <../src/syswait.h>
+#ifdef MAIL_USE_POP
+#include "pop.h"
+#endif
+
+#ifdef MSDOS
+#undef access
+#endif /* MSDOS */
+
+#ifndef DIRECTORY_SEP
+#define DIRECTORY_SEP '/'
+#endif
+#ifndef IS_DIRECTORY_SEP
+#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
+#endif
+
+#ifdef WINDOWSNT
+#undef access
+#undef unlink
+#define fork() 0
+#define sys_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
+#endif /* WINDOWSNT */
#ifdef USG
#include <fcntl.h>
#endif
#endif /* USG */
-#ifdef XENIX
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if defined (XENIX) || defined (WINDOWSNT)
#include <sys/locking.h>
#endif
+#ifdef MAIL_USE_LOCKF
+#define MAIL_USE_SYSTEM_LOCK
+#endif
+
+#ifdef MAIL_USE_FLOCK
+#define MAIL_USE_SYSTEM_LOCK
+#endif
+
#ifdef MAIL_USE_MMDF
extern int lk_open (), lk_close ();
#endif
#undef write
#undef close
-char *concat ();
+#ifndef errno
extern int errno;
+#endif
+char *strerror ();
+
+void fatal ();
+void error ();
+void pfatal_with_name ();
+void pfatal_and_delete ();
+char *concat ();
+long *xmalloc ();
+int popmail ();
+int pop_retr ();
+int mbx_write ();
+int mbx_delimit_begin ();
+int mbx_delimit_end ();
/* Nonzero means this is name of a lock file to delete on fatal error. */
char *delete_lockname;
+int
main (argc, argv)
int argc;
char **argv;
{
char *inname, *outname;
int indesc, outdesc;
- char buf[1024];
int nread;
+ WAITTYPE status;
-#ifndef MAIL_USE_FLOCK
+#ifndef MAIL_USE_SYSTEM_LOCK
struct stat st;
long now;
int tem;
char *lockname, *p;
- char tempname[40];
+ char *tempname;
int desc;
-#endif /* not MAIL_USE_FLOCK */
+#endif /* not MAIL_USE_SYSTEM_LOCK */
delete_lockname = 0;
if (argc < 3)
- fatal ("two arguments required");
+ {
+ fprintf (stderr, "Usage: movemail inbox destfile [POP-password]\n");
+ exit(1);
+ }
inname = argv[1];
outname = argv[2];
mmdf_init (argv[0]);
#endif
+ if (*outname == 0)
+ fatal ("Destination file name is empty", 0);
+
/* Check access to output file. */
if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0)
pfatal_with_name (outname);
- /* Also check that outname's directory is writeable to the real uid. */
+ /* Also check that outname's directory is writable to the real uid. */
{
- char *buf = (char *) malloc (strlen (outname) + 1);
- char *p, q;
+ char *buf = (char *) xmalloc (strlen (outname) + 1);
+ char *p;
strcpy (buf, outname);
p = buf + strlen (buf);
- while (p > buf && p[-1] != '/')
+ while (p > buf && !IS_DIRECTORY_SEP (p[-1]))
*--p = 0;
if (p == buf)
*p++ = '.';
}
#ifdef MAIL_USE_POP
- if (!bcmp (inname, "po:", 3))
+ if (!strncmp (inname, "po:", 3))
{
- int status; char *user;
+ int status;
- user = (char *) rindex (inname, ':') + 1;
- status = popmail (user, outname);
+ status = popmail (inname + 3, outname, argc > 3 ? argv[3] : NULL);
exit (status);
}
- setuid (getuid());
+ setuid (getuid ());
#endif /* MAIL_USE_POP */
+#ifndef DISABLE_DIRECT_ACCESS
+
/* Check access to input file. */
if (access (inname, R_OK | W_OK) != 0)
pfatal_with_name (inname);
#ifndef MAIL_USE_MMDF
-#ifndef MAIL_USE_FLOCK
- /* Use a lock file named /usr/spool/mail/$USER.lock:
+#ifndef MAIL_USE_SYSTEM_LOCK
+ /* Use a lock file named after our first argument with .lock appended:
If it exists, the mail file is locked. */
+ /* Note: this locking mechanism is *required* by the mailer
+ (on systems which use it) to prevent loss of mail.
+
+ On systems that use a lock file, extracting the mail without locking
+ WILL occasionally cause loss of mail due to timing errors!
+
+ So, if creation of the lock file fails
+ due to access permission on the mail spool directory,
+ you simply MUST change the permission
+ and/or make movemail a setgid program
+ so it can create lock files properly.
+
+ You might also wish to verify that your system is one
+ which uses lock files for this purpose. Some systems use other methods.
+
+ If your system uses the `flock' system call for mail locking,
+ define MAIL_USE_SYSTEM_LOCK in config.h or the s-*.h file
+ and recompile movemail. If the s- file for your system
+ should define MAIL_USE_SYSTEM_LOCK but does not, send a bug report
+ to bug-gnu-emacs@prep.ai.mit.edu so we can fix it. */
+
lockname = concat (inname, ".lock", "");
+ tempname = (char *) xmalloc (strlen (inname) + strlen ("EXXXXXX") + 1);
strcpy (tempname, inname);
p = tempname + strlen (tempname);
- while (p != tempname && p[-1] != '/')
+ while (p != tempname && !IS_DIRECTORY_SEP (p[-1]))
p--;
*p = 0;
strcpy (p, "EXXXXXX");
mktemp (tempname);
- (void) unlink (tempname);
+ unlink (tempname);
while (1)
{
/* Create the lock file, but not under the lock file name. */
/* Give up if cannot do that. */
- desc = open (tempname, O_WRONLY | O_CREAT, 0666);
+ desc = open (tempname, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (desc < 0)
- pfatal_with_name (concat ("temporary file \"", tempname, "\""));
+ {
+ char *message = (char *) xmalloc (strlen (tempname) + 50);
+ sprintf (message, "%s--see source file lib-src/movemail.c",
+ tempname);
+ pfatal_with_name (message);
+ }
close (desc);
tem = link (tempname, lockname);
- (void) unlink (tempname);
+ unlink (tempname);
if (tem >= 0)
break;
sleep (1);
- /* If lock file is a minute old, unlock it. */
+ /* If lock file is five minutes old, unlock it.
+ Five minutes should be good enough to cope with crashes
+ and wedgitude, and long enough to avoid being fooled
+ by time differences between machines. */
if (stat (lockname, &st) >= 0)
{
now = time (0);
- if (st.st_ctime < now - 60)
- (void) unlink (lockname);
+ if (st.st_ctime < now - 300)
+ unlink (lockname);
}
}
delete_lockname = lockname;
-#endif /* not MAIL_USE_FLOCK */
+#endif /* not MAIL_USE_SYSTEM_LOCK */
+#endif /* not MAIL_USE_MMDF */
-#ifdef MAIL_USE_FLOCK
- indesc = open (inname, O_RDWR);
-#else /* if not MAIL_USE_FLOCK */
- indesc = open (inname, O_RDONLY);
-#endif /* not MAIL_USE_FLOCK */
-#else /* MAIL_USE_MMDF */
- indesc = lk_open (inname, O_RDONLY, 0, 0, 10);
-#endif /* MAIL_USE_MMDF */
+ if (fork () == 0)
+ {
+ setuid (getuid ());
- if (indesc < 0)
- pfatal_with_name (inname);
+#ifndef MAIL_USE_MMDF
+#ifdef MAIL_USE_SYSTEM_LOCK
+ indesc = open (inname, O_RDWR);
+#else /* if not MAIL_USE_SYSTEM_LOCK */
+ indesc = open (inname, O_RDONLY);
+#endif /* not MAIL_USE_SYSTEM_LOCK */
+#else /* MAIL_USE_MMDF */
+ indesc = lk_open (inname, O_RDONLY, 0, 0, 10);
+#endif /* MAIL_USE_MMDF */
-#if defined(BSD) || defined(XENIX)
- /* In case movemail is setuid to root, make sure the user can
- read the output file. */
- /* This is desirable for all systems
- but I don't want to assume all have the umask system call */
- umask (umask (0) & 0333);
-#endif /* BSD or Xenix */
- outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
- if (outdesc < 0)
- pfatal_with_name (outname);
-#ifdef MAIL_USE_FLOCK
+ if (indesc < 0)
+ pfatal_with_name (inname);
+
+#if defined (BSD_SYSTEM) || defined (XENIX)
+ /* In case movemail is setuid to root, make sure the user can
+ read the output file. */
+ /* This is desirable for all systems
+ but I don't want to assume all have the umask system call */
+ umask (umask (0) & 0333);
+#endif /* BSD_SYSTEM || XENIX */
+ outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
+ if (outdesc < 0)
+ pfatal_with_name (outname);
+#ifdef MAIL_USE_SYSTEM_LOCK
+#ifdef MAIL_USE_LOCKF
+ if (lockf (indesc, F_LOCK, 0) < 0) pfatal_with_name (inname);
+#else /* not MAIL_USE_LOCKF */
#ifdef XENIX
- if (locking (indesc, LK_RLCK, 0L) < 0) pfatal_with_name (inname);
+ if (locking (indesc, LK_RLCK, 0L) < 0) pfatal_with_name (inname);
#else
- if (flock (indesc, LOCK_EX) < 0) pfatal_with_name (inname);
+#ifdef WINDOWSNT
+ if (locking (indesc, LK_RLCK, -1L) < 0) pfatal_with_name (inname);
+#else
+ if (flock (indesc, LOCK_EX) < 0) pfatal_with_name (inname);
#endif
-#endif /* MAIL_USE_FLOCK */
-
- while (1)
- {
- nread = read (indesc, buf, sizeof buf);
- if (nread != write (outdesc, buf, nread))
- {
- int saved_errno = errno;
- (void) unlink (outname);
- errno = saved_errno;
- pfatal_with_name (outname);
- }
- if (nread < sizeof buf)
- break;
- }
-
-#ifdef BSD
- fsync (outdesc);
+#endif
+#endif /* not MAIL_USE_LOCKF */
+#endif /* MAIL_USE_SYSTEM_LOCK */
+
+ {
+ char buf[1024];
+
+ while (1)
+ {
+ nread = read (indesc, buf, sizeof buf);
+ if (nread != write (outdesc, buf, nread))
+ {
+ int saved_errno = errno;
+ unlink (outname);
+ errno = saved_errno;
+ pfatal_with_name (outname);
+ }
+ if (nread < sizeof buf)
+ break;
+ }
+ }
+
+#ifdef BSD_SYSTEM
+ if (fsync (outdesc) < 0)
+ pfatal_and_delete (outname);
#endif
- /* Check to make sure no errors before we zap the inbox. */
- if (close (outdesc) != 0)
- {
- int saved_errno = errno;
- (void) unlink (outname);
- errno = saved_errno;
- pfatal_with_name (outname);
- }
+ /* Check to make sure no errors before we zap the inbox. */
+ if (close (outdesc) != 0)
+ pfatal_and_delete (outname);
-#ifdef MAIL_USE_FLOCK
-#if defined(STRIDE) || defined(XENIX)
- /* Stride, xenix have file locking, but no ftruncate. This mess will do. */
- (void) close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666));
+#ifdef MAIL_USE_SYSTEM_LOCK
+#if defined (STRIDE) || defined (XENIX) || defined (WINDOWSNT)
+ /* Stride, xenix have file locking, but no ftruncate. This mess will do. */
+ close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666));
#else
- (void) ftruncate (indesc, 0L);
+ ftruncate (indesc, 0L);
#endif /* STRIDE or XENIX */
-#endif /* MAIL_USE_FLOCK */
+#endif /* MAIL_USE_SYSTEM_LOCK */
#ifdef MAIL_USE_MMDF
- lk_close (indesc, 0, 0, 0);
+ lk_close (indesc, 0, 0, 0);
#else
- close (indesc);
+ close (indesc);
#endif
-#ifndef MAIL_USE_FLOCK
- /* Delete the input file; if we can't, at least get rid of its contents. */
- if (unlink (inname) < 0)
- if (errno != ENOENT)
- creat (inname, 0666);
-#ifndef MAIL_USE_MMDF
+#ifndef MAIL_USE_SYSTEM_LOCK
+ /* Delete the input file; if we can't, at least get rid of its
+ contents. */
+#ifdef MAIL_UNLINK_SPOOL
+ /* This is generally bad to do, because it destroys the permissions
+ that were set on the file. Better to just empty the file. */
+ if (unlink (inname) < 0 && errno != ENOENT)
+#endif /* MAIL_UNLINK_SPOOL */
+ creat (inname, 0600);
+#endif /* not MAIL_USE_SYSTEM_LOCK */
+
+ exit (0);
+ }
+
+ wait (&status);
+ if (!WIFEXITED (status))
+ exit (1);
+ else if (WRETCODE (status) != 0)
+ exit (WRETCODE (status));
+
+#if !defined (MAIL_USE_MMDF) && !defined (MAIL_USE_SYSTEM_LOCK)
unlink (lockname);
-#endif /* not MAIL_USE_MMDF */
-#endif /* not MAIL_USE_FLOCK */
- exit (0);
+#endif /* not MAIL_USE_MMDF and not MAIL_USE_SYSTEM_LOCK */
+
+#endif /* ! DISABLE_DIRECT_ACCESS */
+
+ return 0;
}
\f
/* Print error message and exit. */
+void
fatal (s1, s2)
char *s1, *s2;
{
/* Print error message. `s1' is printf control string, `s2' is arg for it. */
+void
error (s1, s2, s3)
char *s1, *s2, *s3;
{
- printf ("movemail: ");
- printf (s1, s2, s3);
- printf ("\n");
+ fprintf (stderr, "movemail: ");
+ fprintf (stderr, s1, s2, s3);
+ fprintf (stderr, "\n");
}
+void
pfatal_with_name (name)
char *name;
{
- extern int errno, sys_nerr;
- extern char *sys_errlist[];
- char *s;
+ char *s = concat ("", strerror (errno), " for %s");
+ fatal (s, name);
+}
- if (errno < sys_nerr)
- s = concat ("", sys_errlist[errno], " for %s");
- else
- s = "cannot open %s";
+void
+pfatal_and_delete (name)
+ char *name;
+{
+ char *s = concat ("", strerror (errno), " for %s");
+ unlink (name);
fatal (s, name);
}
/* Like malloc but get fatal error if memory is exhausted. */
-int
+long *
xmalloc (size)
- int size;
+ unsigned size;
{
- int result = malloc (size);
+ long *result = (long *) malloc (size);
if (!result)
fatal ("virtual memory exhausted", 0);
return result;
#ifdef MAIL_USE_POP
+#ifndef WINDOWSNT
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
+#else
+#undef _WINSOCKAPI_
+#include <winsock.h>
+#endif
#include <stdio.h>
+#include <pwd.h>
#ifdef USG
#include <fcntl.h>
char *progname;
FILE *sfi;
FILE *sfo;
+char ibuffer[BUFSIZ];
+char obuffer[BUFSIZ];
char Errmsg[80];
-static int debug = 0;
-
-char *get_errmsg ();
-char *getenv ();
-int mbx_write ();
-
-popmail (user, outfile)
+popmail (user, outfile, password)
char *user;
char *outfile;
+ char *password;
{
- char *host;
int nmsgs, nbytes;
- char response[128];
register int i;
int mbfi;
FILE *mbf;
+ char *getenv ();
+ int mbx_write ();
+ popserver server;
+ extern char *strerror ();
- host = getenv ("MAILHOST");
- if (host == NULL)
- {
- fatal ("no MAILHOST defined");
- }
-
- if (pop_init (host) == NOTOK)
- {
- error (Errmsg);
- return 1;
- }
-
- if (getline (response, sizeof response, sfi) != OK)
- {
- error (response);
- return 1;
- }
-
- if (pop_command ("USER %s", user) == NOTOK
- || pop_command ("RPOP %s", user) == NOTOK)
+ server = pop_open (0, user, password, POP_NO_GETPASS);
+ if (! server)
{
- error (Errmsg);
- pop_command ("QUIT");
- return 1;
+ error (pop_error);
+ return (1);
}
- if (pop_stat (&nmsgs, &nbytes) == NOTOK)
+ if (pop_stat (server, &nmsgs, &nbytes))
{
- error (Errmsg);
- pop_command ("QUIT");
- return 1;
+ error (pop_error);
+ return (1);
}
if (!nmsgs)
{
- pop_command ("QUIT");
- return 0;
+ pop_close (server);
+ return (0);
}
mbfi = open (outfile, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (mbfi < 0)
{
- pop_command ("QUIT");
- error ("Error in open: %s, %s", get_errmsg (), outfile);
- return 1;
+ pop_close (server);
+ error ("Error in open: %s, %s", strerror (errno), outfile);
+ return (1);
}
fchown (mbfi, getuid (), -1);
- if ((mbf = fdopen (mbfi, "w")) == NULL)
+ if ((mbf = fdopen (mbfi, "wb")) == NULL)
{
- pop_command ("QUIT");
- error ("Error in fdopen: %s", get_errmsg ());
+ pop_close (server);
+ error ("Error in fdopen: %s", strerror (errno));
close (mbfi);
unlink (outfile);
- return 1;
+ return (1);
}
for (i = 1; i <= nmsgs; i++)
{
mbx_delimit_begin (mbf);
- if (pop_retr (i, mbx_write, mbf) != OK)
+ if (pop_retr (server, i, mbx_write, mbf) != OK)
{
error (Errmsg);
- pop_command ("QUIT");
close (mbfi);
- return 1;
+ return (1);
}
mbx_delimit_end (mbf);
fflush (mbf);
- }
-
- for (i = 1; i <= nmsgs; i++)
- {
- if (pop_command ("DELE %d", i) == NOTOK)
+ if (ferror (mbf))
{
- error (Errmsg);
- pop_command ("QUIT");
+ error ("Error in fflush: %s", strerror (errno));
+ pop_close (server);
close (mbfi);
- return 1;
+ return (1);
}
}
- pop_command ("QUIT");
- close (mbfi);
- return 0;
-}
-
-pop_init (host)
- char *host;
-{
- register struct hostent *hp;
- register struct servent *sp;
- int lport = IPPORT_RESERVED - 1;
- struct sockaddr_in sin;
- register int s;
-
- hp = gethostbyname (host);
- if (hp == NULL)
- {
- sprintf (Errmsg, "MAILHOST unknown: %s", host);
- return NOTOK;
- }
-
- sp = getservbyname ("pop", "tcp");
- if (sp == 0)
- {
- strcpy (Errmsg, "tcp/pop: unknown service");
- return NOTOK;
- }
+ /* On AFS, a call to write only modifies the file in the local
+ * workstation's AFS cache. The changes are not written to the server
+ * until a call to fsync or close is made. Users with AFS home
+ * directories have lost mail when over quota because these checks were
+ * not made in previous versions of movemail. */
- sin.sin_family = hp->h_addrtype;
- bcopy (hp->h_addr, (char *)&sin.sin_addr, hp->h_length);
- sin.sin_port = sp->s_port;
- s = rresvport (&lport);
- if (s < 0)
+#ifdef BSD_SYSTEM
+ if (fsync (mbfi) < 0)
{
- sprintf (Errmsg, "error creating socket: %s", get_errmsg ());
- return NOTOK;
- }
-
- if (connect (s, (char *)&sin, sizeof sin) < 0)
- {
- sprintf (Errmsg, "error during connect: %s", get_errmsg ());
- close (s);
- return NOTOK;
+ error ("Error in fsync: %s", strerror (errno));
+ return (1);
}
+#endif
- sfi = fdopen (s, "r");
- sfo = fdopen (s, "w");
- if (sfi == NULL || sfo == NULL)
+ if (close (mbfi) == -1)
{
- sprintf (Errmsg, "error in fdopen: %s", get_errmsg ());
- close (s);
- return NOTOK;
+ error ("Error in close: %s", strerror (errno));
+ return (1);
}
- return OK;
-}
-
-pop_command (fmt, a, b, c, d)
- char *fmt;
-{
- char buf[128];
- char errmsg[64];
-
- sprintf (buf, fmt, a, b, c, d);
-
- if (debug) fprintf (stderr, "---> %s\n", buf);
- if (putline (buf, Errmsg, sfo) == NOTOK) return NOTOK;
-
- if (getline (buf, sizeof buf, sfi) != OK)
+ for (i = 1; i <= nmsgs; i++)
{
- strcpy (Errmsg, buf);
- return NOTOK;
+ if (pop_delete (server, i))
+ {
+ error (pop_error);
+ pop_close (server);
+ return (1);
+ }
}
- if (debug) fprintf (stderr, "<--- %s\n", buf);
- if (*buf != '+')
- {
- strcpy (Errmsg, buf);
- return NOTOK;
- }
- else
+ if (pop_quit (server))
{
- return OK;
+ error (pop_error);
+ return (1);
}
-}
-
-pop_stat (nmsgs, nbytes)
- int *nmsgs, *nbytes;
-{
- char buf[128];
-
- if (debug) fprintf (stderr, "---> STAT\n");
- if (putline ("STAT", Errmsg, sfo) == NOTOK) return NOTOK;
-
- if (getline (buf, sizeof buf, sfi) != OK)
- {
- strcpy (Errmsg, buf);
- return NOTOK;
- }
-
- if (debug) fprintf (stderr, "<--- %s\n", buf);
- if (*buf != '+')
- {
- strcpy (Errmsg, buf);
- return NOTOK;
- }
- else
- {
- sscanf (buf, "+OK %d %d", nmsgs, nbytes);
- return OK;
- }
+ return (0);
}
-pop_retr (msgno, action, arg)
+pop_retr (server, msgno, action, arg)
+ popserver server;
int (*action)();
{
- char buf[128];
-
- sprintf (buf, "RETR %d", msgno);
- if (debug) fprintf (stderr, "%s\n", buf);
- if (putline (buf, Errmsg, sfo) == NOTOK) return NOTOK;
+ extern char *strerror ();
+ char *line;
+ int ret;
- if (getline (buf, sizeof buf, sfi) != OK)
+ if (pop_retrieve_first (server, msgno, &line))
{
- strcpy (Errmsg, buf);
- return NOTOK;
+ strncpy (Errmsg, pop_error, sizeof (Errmsg));
+ Errmsg[sizeof (Errmsg)-1] = '\0';
+ return (NOTOK);
}
- while (1)
+ while (! (ret = pop_retrieve_next (server, &line)))
{
- switch (multiline (buf, sizeof buf, sfi))
+ if (! line)
+ break;
+
+ if ((*action)(line, arg) != OK)
{
- case OK:
- (*action)(buf, arg);
- break;
- case DONE:
- return OK;
- case NOTOK:
- strcpy (Errmsg, buf);
- return NOTOK;
+ strcpy (Errmsg, strerror (errno));
+ pop_close (server);
+ return (NOTOK);
}
}
-}
-
-getline (buf, n, f)
- char *buf;
- register int n;
- FILE *f;
-{
- register char *p;
- int c;
-
- p = buf;
- while (--n > 0 && (c = fgetc (f)) != EOF)
- if ((*p++ = c) == '\n') break;
-
- if (ferror (f))
- {
- strcpy (buf, "error on connection");
- return NOTOK;
- }
- if (c == EOF && p == buf)
+ if (ret)
{
- strcpy (buf, "connection closed by foreign host");
- return DONE;
+ strncpy (Errmsg, pop_error, sizeof (Errmsg));
+ Errmsg[sizeof (Errmsg)-1] = '\0';
+ return (NOTOK);
}
- *p = NULL;
- if (*--p == '\n') *p = NULL;
- if (*--p == '\r') *p = NULL;
- return OK;
+ return (OK);
}
-multiline (buf, n, f)
- char *buf;
- register int n;
- FILE *f;
-{
- if (getline (buf, n, f) != OK) return NOTOK;
- if (*buf == '.')
- {
- if (*(buf+1) == NULL)
- {
- return DONE;
- }
- else
- {
- strcpy (buf, buf+1);
- }
- }
- return OK;
-}
-
-char *
-get_errmsg ()
-{
- extern int errno, sys_nerr;
- extern char *sys_errlist[];
- char *s;
-
- if (errno < sys_nerr)
- s = sys_errlist[errno];
- else
- s = "unknown error";
- return (s);
-}
-
-putline (buf, err, f)
- char *buf;
- char *err;
- FILE *f;
-{
- fprintf (f, "%s\r\n", buf);
- fflush (f);
- if (ferror (f))
- {
- strcpy (err, "lost connection");
- return NOTOK;
- }
- return OK;
-}
+/* Do this as a macro instead of using strcmp to save on execution time. */
+#define IS_FROM_LINE(a) ((a[0] == 'F') \
+ && (a[1] == 'r') \
+ && (a[2] == 'o') \
+ && (a[3] == 'm') \
+ && (a[4] == ' '))
+int
mbx_write (line, mbf)
char *line;
FILE *mbf;
{
- fputs (line, mbf);
- fputc (0x0a, mbf);
+ if (IS_FROM_LINE (line))
+ {
+ if (fputc ('>', mbf) == EOF)
+ return (NOTOK);
+ }
+ if (fputs (line, mbf) == EOF)
+ return (NOTOK);
+ if (fputc (0x0a, mbf) == EOF)
+ return (NOTOK);
+ return (OK);
}
+int
mbx_delimit_begin (mbf)
FILE *mbf;
{
- fputs ("\f\n0, unseen,,\n", mbf);
+ if (fputs ("\f\n0, unseen,,\n", mbf) == EOF)
+ return (NOTOK);
+ return (OK);
}
mbx_delimit_end (mbf)
FILE *mbf;
{
- putc ('\037', mbf);
+ if (putc ('\037', mbf) == EOF)
+ return (NOTOK);
+ return (OK);
}
#endif /* MAIL_USE_POP */
+\f
+#ifndef HAVE_STRERROR
+char *
+strerror (errnum)
+ int errnum;
+{
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+
+ if (errnum >= 0 && errnum < sys_nerr)
+ return sys_errlist[errnum];
+ return (char *) "Unknown error";
+}
+
+#endif /* ! HAVE_STRERROR */