(try_window_id) <all changes below window end>: Don't

[gnu-emacs] / src / filelock.c

diff --git a/src/filelock.c b/src/filelock.c
index 8fb41a3d7eb173387387143ccd94061344363b78..44db9722f91048c165114f79b72731eb2b60b6c4 100644 (file)
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -1,5 +1,6 @@
 /* Lock files for editing.
-   Copyright (C) 1985, 86, 87, 93, 94, 96, 98, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 87, 93, 94, 96, 98, 1999, 2000
+   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -32,33 +33,32 @@ Boston, MA 02111-1307, USA.  */
 #endif /* not VMS */
 
 #include <sys/file.h>
-#ifdef USG
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
-#endif /* USG */
+#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #ifdef __FreeBSD__
-#include <sys/time.h>
-#include <sys/types.h>
 #include <sys/sysctl.h>
 #endif /* __FreeBSD__ */
 
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
 #include "lisp.h"
 #include "buffer.h"
 #include "charset.h"
 #include "coding.h"
 #include "systime.h"
 
-#include <time.h>
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
 /* The directory for writing temporary files.  */
 
 Lisp_Object Vtemporary_file_directory;
@@ -203,9 +203,15 @@ get_boot_time ()
          if (! NILP (Ffile_exists_p (tempname)))
            {
              Lisp_Object args[6];
-             tempname = Fexpand_file_name (build_string ("wtmp"),
+
+             /* The utmp functions on mescaline.gnu.org accept only
+                file names up to 8 characters long.  Choose a 2
+                character long prefix, and call make_temp_file with
+                second arg non-zero, so that it will add not more
+                than 6 characters to the prefix.  */
+             tempname = Fexpand_file_name (build_string ("wt"),
                                            Vtemporary_file_directory);
-             tempname = Fmake_temp_name (tempname);
+             tempname = make_temp_name (tempname, 1);
              args[0] = Vshell_file_name;
              args[1] = Qnil;
              args[2] = Qnil;
@@ -311,9 +317,11 @@ typedef struct
 
 
 /* Write the name of the lock file for FN into LFNAME.  Length will be
-   that of FN plus two more for the leading `.#' plus one for the null.  */
+   that of FN plus two more for the leading `.#' plus 1 for the
+   trailing period plus one for the digit after it plus one for the
+   null.  */
 #define MAKE_LOCK_NAME(lock, file) \
-  (lock = (char *) alloca (STRING_BYTES (XSTRING (file)) + 2 + 1), \
+  (lock = (char *) alloca (STRING_BYTES (XSTRING (file)) + 2 + 1 + 1 + 1), \
    fill_in_lock_file_name (lock, (file)))
 
 static void
@@ -322,6 +330,8 @@ fill_in_lock_file_name (lockfile, fn)
      register Lisp_Object fn;
 {
   register char *p;
+  struct stat st;
+  int count = 0;
 
   strcpy (lockfile, XSTRING (fn)->data);
 
@@ -334,6 +344,18 @@ fill_in_lock_file_name (lockfile, fn)
   /* Insert the `.#'.  */
   p[1] = '.';
   p[2] = '#';
+
+  p = p + strlen (p);
+
+  while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode))
+    {
+      if (count > 9)
+       {
+         *p = '\0';
+         return;
+       }
+      sprintf (p, ".%d", count++);
+    }
 }
 
 /* Lock the lock file named LFNAME.
@@ -639,12 +661,7 @@ unlock_all_files ()
       b = XBUFFER (XCDR (XCAR (tail)));
       if (STRINGP (b->file_truename) && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b))
        {
-         register char *lfname;
-
-         MAKE_LOCK_NAME (lfname, b->file_truename);
-
-         if (current_lock_owner (0, lfname) == 2)
-           unlink (lfname);
+         unlock_file(b->file_truename);
        }
     }
 }