mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Comments

Browse source
This commit is contained in:
Glenn Morris 2012-08-10 00:07:07 -07:00
parent 39cb9e56e9
commit 0aa8781fc0
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -2709,9 +2709,6 @@ case "$opsys" in
;; ;;
esac esac
dnl FIXME? If using FLOCK, also define MAIL_USE_SYSTEM_LOCK?
dnl Only win32 seems to use that.
dnl See comments in lib-src/movemail.c.
BLESSMAIL_TARGET= BLESSMAIL_TARGET=
case "$mail_lock" in case "$mail_lock" in
flock) AC_DEFINE(MAIL_USE_FLOCK, 1, [Define if the mailer uses flock to interlock the mail spool.]) ;; flock) AC_DEFINE(MAIL_USE_FLOCK, 1, [Define if the mailer uses flock to interlock the mail spool.]) ;;

15
lib-src/movemail.c
View file

@ -22,7 +22,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will /* 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 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 use flock/lockf as its way of interlocking access to inbox files. The
setting of MAIL_USE_FLOCK and MAIL_USE_LOCKF *must agree* with 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. system's own conventions. It is not a choice that is up to you.
@ -109,6 +109,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <sys/locking.h> #include <sys/locking.h>
#endif #endif
/* If your system uses the `flock' or `lockf' system call for mail locking,
define MAIL_USE_SYSTEM_LOCK. If your system type should always define
MAIL_USE_LOCKF or MAIL_USE_FLOCK but configure does not do this,
please make a bug report. */
#ifdef MAIL_USE_LOCKF #ifdef MAIL_USE_LOCKF
#define MAIL_USE_SYSTEM_LOCK #define MAIL_USE_SYSTEM_LOCK
#endif #endif
@ -289,13 +294,7 @@ main (int argc, char **argv)
so it can create lock files properly. so it can create lock files properly.
You might also wish to verify that your system is one which You might also wish to verify that your system is one which
uses lock files for this purpose. Some systems use other methods. 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 and recompile movemail.
If your system type should always define MAIL_USE_SYSTEM_LOCK
but does not, send a bug report to bug-gnu-emacs@gnu.org so we
can change the default in configure. */
inname_len = strlen (inname); inname_len = strlen (inname);
lockname = xmalloc (inname_len + sizeof ".lock"); lockname = xmalloc (inname_len + sizeof ".lock");