[Emacs-diffs] /srv/bzr/emacs/trunk r109544: Comments

[Glenn Morris]

------------------------------------------------------------
revno: 109544
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-10 00:07:07 -0700
message:
  Comments
modified:
  configure.ac
  lib-src/movemail.c

=== modified file 'configure.ac'
--- a/configure.ac      2012-08-10 00:02:10 +0000
+++ b/configure.ac      2012-08-10 07:07:07 +0000
@@ -2709,9 +2709,6 @@
     ;;
 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=
 case "$mail_lock" in
   flock) AC_DEFINE(MAIL_USE_FLOCK, 1, [Define if the mailer uses flock to 
interlock the mail spool.]) ;;

=== modified file 'lib-src/movemail.c'
--- a/lib-src/movemail.c        2012-08-10 00:02:10 +0000
+++ b/lib-src/movemail.c        2012-08-10 07:07:07 +0000
@@ -22,7 +22,7 @@
 
 /* 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
+   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
    system's own conventions.  It is not a choice that is up to you.
 
@@ -109,6 +109,11 @@
 #include <sys/locking.h>
 #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
 #define MAIL_USE_SYSTEM_LOCK
 #endif
@@ -289,13 +294,7 @@
         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 and recompile movemail.
-        If your system type should always define MAIL_USE_SYSTEM_LOCK
-        but does not, send a bug report to address@hidden so we
-        can change the default in configure.  */
+        uses lock files for this purpose.  Some systems use other methods.  */
 
       inname_len = strlen (inname);
       lockname = xmalloc (inname_len + sizeof ".lock");