mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 05:30:45 -08:00
Code Issues Projects Releases Wiki Activity

Make make_lock_file_name more robust

Browse source 
* src/filelock.c (make_lock_file_name): Protect against the
make-lock-file-name not being defined.
(lock_file, unlock_file_body, Ffile_locked_p): Return early if not
defined.
This commit is contained in:
Lars Ingebrigtsen 2021-07-07 22:15:42 +02:00
parent fadfc55db1
commit e762864b9d
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/filelock.c
View file

@ -622,7 +622,10 @@ lock_if_free (lock_info_type *clasher, char *lfname)
static Lisp_Object
make_lock_file_name (Lisp_Object fn)
{
return call1 (intern ("make-lock-file-name"), Fexpand_file_name (fn, Qnil));
Lisp_Object func = intern ("make-lock-file-name");
if (NILP (Fboundp (func)))
return Qnil;
return call1 (func, Fexpand_file_name (fn, Qnil));
}
/* lock_file locks file FN,
@ -663,6 +666,8 @@ lock_file (Lisp_Object fn)
}
Lisp_Object lock_filename = make_lock_file_name (fn);
if (NILP (lock_filename))
return;
char *lfname = SSDATA (ENCODE_FILE (lock_filename));
/* See if this file is visited and has changed on disk since it was
@ -715,6 +720,8 @@ unlock_file_body (Lisp_Object fn)
}
Lisp_Object lock_filename = make_lock_file_name (fn);
if (NILP (lock_filename))
return Qnil;
lfname = SSDATA (ENCODE_FILE (lock_filename));
int err = current_lock_owner (0, lfname);
@ -859,6 +866,8 @@ t if it is locked by you, else a string saying which user has locked it. */)
}
Lisp_Object lock_filename = make_lock_file_name (filename);
if (NILP (lock_filename))
return Qnil;
char *lfname = SSDATA (ENCODE_FILE (lock_filename));
owner = current_lock_owner (&locker, lfname);