bug#24656: 25.1; Emacs leaves lock files on a CIFS share

[Jan Synacek <jsynacek@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

On Mon, Oct 10, 2016 at 5:49 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Jan Synacek <jsynacek@redhat.com>
>> Date: Mon, 10 Oct 2016 15:49:11 +0200
>> Cc: 24656@debbugs.gnu.org
>>
>> The lock_file_1 correctly uses a path with a colon in it. Indeed,
>> samba seems to substitute it. I tried to patch the emacs source to use
>> a comma instead. It didn't get substituted by samba, but the lock file
>> didn't go away when I exited emacs.
>
> Did you also patch current_lock_owner to account for the change from a
> colon to a comma?

Aha! After patching current_lock_owner, the lock file is correctly
removed. I'm attaching the patch.

Thank you!
-- 
Jan Synacek
Software Engineer, Red Hat

[-- Attachment #2: emacs.patch --]
[-- Type: text/x-patch, Size: 739 bytes --]

diff --git a/src/filelock.c b/src/filelock.c
index a2e1df9..bcc2e03 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -450,7 +450,7 @@ lock_file_1 (char *lfname, bool force)
     {
       if (sizeof lock_info_str
           <= snprintf (lock_info_str, sizeof lock_info_str,
-                       "%s@%s.%"pMd":%"pMd,
+                       "%s@%s.%"pMd",%"pMd,
                        user_name, host_name, pid, boot))
         return ENAMETOOLONG;
     }
@@ -564,7 +564,7 @@ current_lock_owner (lock_info_type *owner, char *lfname)
       lfinfo_end = owner->colon;
       break;
 
-    case ':':
+    case ',':
       if (! c_isdigit (owner->colon[1]))
 	return -1;
       boot_time = strtoimax (owner->colon + 1, &lfinfo_end, 10);