(print_error_message): Print data of `end-of-file'

[gnu-emacs] / src / filelock.c

diff --git a/src/filelock.c b/src/filelock.c
index 66f347b479c49e60394e9e973cf4219b102099b6..02b3ccc8b05ad330d941661f51fd8cdd082e1792 100644 (file)
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -120,6 +120,10 @@ static int boot_time_initialized;
 
 extern Lisp_Object Vshell_file_name;
 
+#ifdef BOOT_TIME
+static void get_boot_time_1 P_ ((char *, int));
+#endif
+
 static time_t
 get_boot_time ()
 {
@@ -241,6 +245,7 @@ get_boot_time ()
    Ignore all reboot records on or before BOOT_TIME.
    Success is indicated by setting BOOT_TIME to a larger value.  */
 
+void
 get_boot_time_1 (filename, newest)
      char *filename;
      int newest;
@@ -306,9 +311,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
@@ -317,6 +324,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);
 
@@ -329,6 +338,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.
@@ -685,7 +706,7 @@ unlock_buffer (buffer)
     unlock_file (buffer->file_truename);
 }
 
-DEFUN ("file-locked-p", Ffile_locked_p, Sfile_locked_p, 0, 1, 0,
+DEFUN ("file-locked-p", Ffile_locked_p, Sfile_locked_p, 1, 1, 0,
   "Return nil if the FILENAME is not locked,\n\
 t if it is locked by you, else a string of the name of the locker.")
   (filename)