X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/1bad168e59601c1c843a38b2962e77b29f497f11..80ddad17acad2466d0aa04f208d14f56a3fd2ff3:/lib-src/movemail.c
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 1f95735878..d452fd15a7 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,14 +1,14 @@
/* movemail foo bar -- move file foo to file bar,
locking file foo the way /bin/mail respects.
Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+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 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see . */
+
/* 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
@@ -55,7 +54,6 @@ Boston, MA 02110-1301, USA. */
*
*/
-#define NO_SHORTNAMES /* Tell config not to load remap.h */
#include
#include
#include
@@ -175,7 +173,7 @@ main (argc, argv)
char *inname, *outname;
int indesc, outdesc;
int nread;
- WAITTYPE status;
+ int status;
int c, preserve_mail = 0;
#ifndef MAIL_USE_SYSTEM_LOCK
@@ -343,6 +341,13 @@ main (argc, argv)
close (desc);
tem = link (tempname, lockname);
+
+#ifdef EPERM
+ if (tem < 0 && errno == EPERM)
+ fatal ("Unable to create hard link between %s and %s",
+ tempname, lockname);
+#endif
+
unlink (tempname);
if (tem >= 0)
break;
@@ -692,7 +697,7 @@ char Errmsg[200]; /* POP errors, at least, can exceed
the original length of 80. */
/*
- * The full legal syntax for a POP mailbox specification for movemail
+ * The full valid 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
@@ -918,7 +923,7 @@ int
mbx_delimit_begin (mbf)
FILE *mbf;
{
- if (fputs ("\f\n0, unseen,,\n", mbf) == EOF)
+ if (fputs ("From movemail\n", mbf) == EOF)
return (NOTOK);
return (OK);
}
@@ -927,7 +932,7 @@ int
mbx_delimit_end (mbf)
FILE *mbf;
{
- if (putc ('\037', mbf) == EOF)
+ if (putc ('\n', mbf) == EOF)
return (NOTOK);
return (OK);
}