diff options
| author | Eli Zaretskii | 2013-02-25 19:36:03 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-02-25 19:36:03 +0200 |
| commit | 343a2aefb528ce3c978ba2145705b9e37bfbe02a (patch) | |
| tree | 4672030eea98dfc9bd077ac58400271d1c812918 /lisp | |
| parent | aec32f66d0db82b562e904dfe7bb6d54796fe773 (diff) | |
| download | emacs-343a2aefb528ce3c978ba2145705b9e37bfbe02a.tar.gz emacs-343a2aefb528ce3c978ba2145705b9e37bfbe02a.zip | |
Implement CLASH_DETECTION for MS-Windows.
src/filelock.c [WINDOWSNT]: Include w32.h.
(MAKE_LOCK_NAME): Don't use 'lock', it clashes with MS runtime
function of that name. Up-case the macro arguments.
(IS_LOCK_FILE): New macro.
(fill_in_lock_file_name): Use IS_LOCK_FILE instead of S_ISLNK.
(create_lock_file): New function, with body extracted from
lock_file_1.
[WINDOWSNT]: Implement lock files by writing a regular file with
the lock information as its contents.
(read_lock_data): New function, on Posix platforms just calls
emacs_readlinkat.
[WINDOWSNT]: Read the lock info from the file.
(current_lock_owner): Call read_lock_data instead of calling
emacs_readlinkat directly.
(lock_file) [WINDOWSNT]: Run the file name through
dostounix_filename.
src/w32proc.c (sys_kill): Support the case of SIG = 0, in which case
just check if the process by that PID exists.
src/w32.c (sys_open): Don't reset the _O_CREAT flag if _O_EXCL is
also present, as doing so will fail to error out if the file
already exists.
src/makefile.w32-in ($(BLD)/filelock.$(O)): Depend on src/w32.h.
nt/inc/ms-w32.h (BOOT_TIME_FILE): Define.
nt/config.nt (CLASH_DETECTION): Define to 1.
lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Reject files
that match "\`\.#", to avoid compiling lock files, even if they
are readable (as they are on MS-Windows).
doc/emacs/files.texi (Interlocking): Don't refer to symlinks as the
exclusive means of locking files.
etc/NEWS: Mention support for lock files on MS-Windows.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07c3df9e279..c8fb65e89e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-02-25 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/bytecomp.el (byte-recompile-directory): Reject files | ||
| 4 | that match "\`\.#", to avoid compiling lock files, even if they | ||
| 5 | are readable (as they are on MS-Windows). | ||
| 6 | |||
| 1 | 2013-02-25 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2013-02-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * files.el (basic-save-buffer): Remove redundant directory-creation. | 9 | * files.el (basic-save-buffer): Remove redundant directory-creation. |
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index f5861550c9a..e0837033c74 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el | |||
| @@ -1594,7 +1594,9 @@ that already has a `.elc' file." | |||
| 1594 | (setq directories (nconc directories (list source)))) | 1594 | (setq directories (nconc directories (list source)))) |
| 1595 | ;; It is an ordinary file. Decide whether to compile it. | 1595 | ;; It is an ordinary file. Decide whether to compile it. |
| 1596 | (if (and (string-match emacs-lisp-file-regexp source) | 1596 | (if (and (string-match emacs-lisp-file-regexp source) |
| 1597 | ;; The next 2 tests avoid compiling lock files | ||
| 1597 | (file-readable-p source) | 1598 | (file-readable-p source) |
| 1599 | (not (string-match "\\`\\.#" file)) | ||
| 1598 | (not (auto-save-file-name-p source)) | 1600 | (not (auto-save-file-name-p source)) |
| 1599 | (not (string-equal dir-locals-file | 1601 | (not (string-equal dir-locals-file |
| 1600 | (file-name-nondirectory source)))) | 1602 | (file-name-nondirectory source)))) |