aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-09-18 16:55:21 +0000
committerJuanma Barranquero2009-09-18 16:55:21 +0000
commitd75541671f2092c2cae1d189e93d87426abc2589 (patch)
treeb8c49f478b5fb614a73b62034dbea3444af7a5df
parent35a3f9a4b41845d3b99b3c3d1a3e5033403b09cb (diff)
downloademacs-d75541671f2092c2cae1d189e93d87426abc2589.tar.gz
emacs-d75541671f2092c2cae1d189e93d87426abc2589.zip
* server.el (server-ensure-safe-dir): Pass 'integer
to `file-attributes', as suggested.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/server.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76144677c87..976b8190c22 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-09-18 Juanma Barranquero <lekktu@gmail.com>
2
3 * server.el (server-ensure-safe-dir): Pass 'integer
4 to `file-attributes', as suggested.
5
12009-09-18 Stefan Monnier <monnier@iro.umontreal.ca> 62009-09-18 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * dired-aux.el (dired-query-alist): Remove spurious backslash. 8 * dired-aux.el (dired-query-alist): Remove spurious backslash.
diff --git a/lisp/server.el b/lisp/server.el
index 610ace05590..f198ac83693 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -449,10 +449,10 @@ Creates the directory if necessary and makes sure:
449- it's owned by us 449- it's owned by us
450- it's not readable/writable by anybody else." 450- it's not readable/writable by anybody else."
451 (setq dir (directory-file-name dir)) 451 (setq dir (directory-file-name dir))
452 (let ((attrs (file-attributes dir))) 452 (let ((attrs (file-attributes dir 'integer)))
453 (unless attrs 453 (unless attrs
454 (letf (((default-file-modes) ?\700)) (make-directory dir t)) 454 (letf (((default-file-modes) ?\700)) (make-directory dir t))
455 (setq attrs (file-attributes dir))) 455 (setq attrs (file-attributes dir 'integer)))
456 ;; Check that it's safe for use. 456 ;; Check that it's safe for use.
457 (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid)) 457 (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid))
458 (or (eq system-type 'windows-nt) 458 (or (eq system-type 'windows-nt)