/* movemail foo bar -- move file foo to file bar,
locking file foo the way /bin/mail respects.
- Copyright (C) 1986, 1992, 1993, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
This file is part of GNU Emacs.
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
/*
* 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
#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>
#include <unistd.h>
#include <unistd.h>
#endif
-#ifdef XENIX
+#if defined (XENIX) || defined (WINDOWSNT)
#include <sys/locking.h>
#endif
if (argc < 3)
{
- fprintf (stderr, "Usage: movemail inbox destfile\n");
+ fprintf (stderr, "Usage: movemail inbox destfile [POP-password]\n");
exit(1);
}
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 *) 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++ = '.';
{
int status;
- status = popmail (inname + 3, outname);
+ status = popmail (inname + 3, outname, argc > 3 ? argv[3] : NULL);
exit (status);
}
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_SYSTEM_LOCK
- /* Use a lock file named /usr/spool/mail/$USER.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.
WILL occasionally cause loss of mail due to timing errors!
So, if creation of the lock file fails
- due to access permission on /usr/spool/mail,
+ 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.
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");
/* Give up if cannot do that. */
desc = open (tempname, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (desc < 0)
- pfatal_with_name ("lock file--see source file lib-src/movemail.c");
+ {
+ 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);
if (indesc < 0)
pfatal_with_name (inname);
-#if defined (BSD) || defined (XENIX)
+#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 or Xenix */
+#endif /* BSD_SYSTEM || XENIX */
outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (outdesc < 0)
pfatal_with_name (outname);
#else /* not MAIL_USE_LOCKF */
#ifdef XENIX
if (locking (indesc, LK_RLCK, 0L) < 0) pfatal_with_name (inname);
+#else
+#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
#endif /* not MAIL_USE_LOCKF */
#endif /* MAIL_USE_SYSTEM_LOCK */
}
}
-#ifdef BSD
+#ifdef BSD_SYSTEM
if (fsync (outdesc) < 0)
pfatal_and_delete (outname);
#endif
pfatal_and_delete (outname);
#ifdef MAIL_USE_SYSTEM_LOCK
-#if defined (STRIDE) || defined (XENIX)
+#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
#if !defined (MAIL_USE_MMDF) && !defined (MAIL_USE_SYSTEM_LOCK)
unlink (lockname);
#endif /* not MAIL_USE_MMDF and not MAIL_USE_SYSTEM_LOCK */
+
+#endif /* ! DISABLE_DIRECT_ACCESS */
+
return 0;
}
\f
#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>
char obuffer[BUFSIZ];
char Errmsg[80];
-popmail (user, outfile)
+popmail (user, outfile, password)
char *user;
char *outfile;
+ char *password;
{
int nmsgs, nbytes;
register int i;
popserver server;
extern char *strerror ();
- server = pop_open (0, user, 0, POP_NO_GETPASS);
+ server = pop_open (0, user, password, POP_NO_GETPASS);
if (! server)
{
error (pop_error);
}
fchown (mbfi, getuid (), -1);
- if ((mbf = fdopen (mbfi, "w")) == NULL)
+ if ((mbf = fdopen (mbfi, "wb")) == NULL)
{
pop_close (server);
error ("Error in fdopen: %s", strerror (errno));
* directories have lost mail when over quota because these checks were
* not made in previous versions of movemail. */
-#ifdef BSD
+#ifdef BSD_SYSTEM
if (fsync (mbfi) < 0)
{
error ("Error in fsync: %s", strerror (errno));