From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 31 Jul 1997 07:54:07 +0000 (+0000)
Subject: (current_lock_owner): Don't try to delete lock
X-Git-Tag: emacs-20.1~888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72dcef0e0ec7c1757ebe92fb5913caee99d6bc5f;p=emacs.git

(current_lock_owner): Don't try to delete lock
if this or another existing process owns it!
---

diff --git a/src/filelock.c b/src/filelock.c
index b79bccc65a5..6116b89fd96 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -240,17 +240,15 @@ current_lock_owner (owner, lfname)
     {
       if (owner->pid == getpid ())
         ret = 2; /* We own it.  */
-      
-      if (owner->pid > 0
+      else if (owner->pid > 0
                && (kill (owner->pid, 0) >= 0 || errno == EPERM))
         ret = 1; /* An existing process on this machine owns it.  */
-      
       /* The owner process is dead or has a strange pid (<=0), so try to
          zap the lockfile.  */
-      if (unlink (lfname) < 0)
+      else if (unlink (lfname) < 0)
         ret = -1;
-      
-      ret = 0;
+      else
+	ret = 0;
     }
   else
     { /* If we wanted to support the check for stale locks on remote machines,