mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-13 09:32:47 +00:00
662bee7d70
Mostly, this replaces magic-number calls like (nth 4 A) with more-informative calls like (file-attribute-access-time A). It also fixes some documentation and minor timestamp coding issues that I noticed while looking into this. * doc/lispref/files.texi (File Attributes): * lisp/files.el (file-attribute-size) (file-attribute-inode-number, file-attribute-device-number): * src/dired.c (Fdirectory_files_and_attributes) (Ffile_attributes): Mention which attributes must be integers, or nonnegative integers, as opposed to merely being numbers. Remove no-longer-correct talk about representing large integers as conses of integers. * doc/lispref/files.texi (Magic File Names): * doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary): * lisp/autorevert.el (auto-revert-find-file-function) (auto-revert-tail-mode, auto-revert-handler): * lisp/auth-source.el (auth-source-netrc-parse): * lisp/cedet/ede/files.el (ede--inode-for-dir): * lisp/cedet/semantic/db-file.el (object-write): * lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook): * lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p) (semanticdb-synchronize): * lisp/cedet/srecode/table.el (srecode-mode-table-new): * lisp/desktop.el (desktop-save, desktop-read): * lisp/dired-aux.el (dired-file-set-difference) (dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive) (dired-create-files): * lisp/dired.el (dired-directory-changed-p, dired-readin): * lisp/dos-w32.el (w32-direct-print-region-helper): * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads) (autoload-find-destination, update-directory-autoloads): * lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent): * lisp/epg.el (epg--start, epg-wait-for-completion): * lisp/eshell/em-ls.el (eshell-ls-filetype-p) (eshell-ls-applicable, eshell-ls-size-string) (eshell-ls-file, eshell-ls-dir, eshell-ls-files) (eshell-ls-entries): * lisp/eshell/em-pred.el (eshell-predicate-alist) (eshell-pred-file-type, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat) (eshell-du-sum-directory, eshell/du): * lisp/eshell/esh-util.el (eshell-read-passwd) (eshell-read-hosts): * lisp/files.el (remote-file-name-inhibit-cache) (find-file-noselect, insert-file-1, dir-locals-find-file) (dir-locals-read-from-dir, backup-buffer) (file-ownership-preserved-p, copy-directory) (read-file-modes): * lisp/find-lisp.el (find-lisp-format): * lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles) (gnus-agent-read-agentview, gnus-agent-expire-group-1) (gnus-agent-request-article, gnus-agent-regenerate-group) (gnus-agent-update-files-total-fetched-for) (gnus-agent-update-view-total-fetched-for): * lisp/gnus/gnus-cache.el (gnus-cache-read-active) (gnus-cache-update-file-total-fetched-for) (gnus-cache-update-overview-total-fetched-for): * lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p): * lisp/gnus/gnus-score.el (gnus-score-score-files): * lisp/gnus/gnus-start.el (gnus-save-newsrc-file) (gnus-master-read-slave-newsrc): * lisp/gnus/gnus-sum.el (gnus-summary-import-article): * lisp/gnus/gnus-util.el (gnus-file-newer-than) (gnus-cache-file-contents): * lisp/gnus/mail-source.el (mail-source-delete-old-incoming) (mail-source-callback, mail-source-movemail): * lisp/gnus/nneething.el (nneething-create-mapping) (nneething-make-head): * lisp/gnus/nnfolder.el (nnfolder-read-folder): * lisp/gnus/nnheader.el (nnheader-file-size) (nnheader-insert-nov-file): * lisp/gnus/nnmail.el (nnmail-activate): * lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum) (nnmaildir--new-number, nnmaildir--update-nov) (nnmaildir--scan, nnmaildir-request-scan) (nnmaildir-request-update-info) (nnmaildir-request-expire-articles): * lisp/gnus/nnmh.el (nnmh-request-list-1) (nnmh-request-expire-articles, nnmh-update-gnus-unreads): * lisp/gnus/nnml.el (nnml-request-expire-articles): * lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load) (spam-stat-process-directory, spam-stat-test-directory): * lisp/ido.el (ido-directory-too-big-p) (ido-file-name-all-completions): * lisp/image-dired.el (image-dired-get-thumbnail-image) (image-dired-create-thumb-1): * lisp/info.el (info-insert-file-contents): * lisp/ls-lisp.el (ls-lisp-insert-directory) (ls-lisp-handle-switches, ls-lisp-classify-file) (ls-lisp-format): * lisp/mail/blessmail.el: * lisp/mail/feedmail.el (feedmail-default-date-generator) (feedmail-default-message-id-generator): * lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases) (mail-abbrevs-setup): * lisp/mail/mspools.el (mspools-size-folder): * lisp/mail/rmail.el (rmail-insert-inbox-text): * lisp/mail/sendmail.el (sendmail-sync-aliases): * lisp/mh-e/mh-alias.el (mh-alias-tstamp): * lisp/net/ange-ftp.el (ange-ftp-parse-netrc) (ange-ftp-write-region, ange-ftp-file-newer-than-file-p) (ange-ftp-cf1): * lisp/net/eudcb-mab.el (eudc-mab-query-internal): * lisp/net/eww.el (eww-read-bookmarks): * lisp/net/netrc.el (netrc-parse): * lisp/net/newst-backend.el (newsticker--image-get): * lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file): * lisp/obsolete/fast-lock.el (fast-lock-save-cache): * lisp/obsolete/vc-arch.el (vc-arch-state) (vc-arch-diff3-rej-p): * lisp/org/ob-eval.el (org-babel--shell-command-on-region): * lisp/org/org-attach.el (org-attach-commit): * lisp/org/org-macro.el (org-macro-initialize-templates): * lisp/org/org.el (org-babel-load-file) (org-file-newer-than-p): * lisp/org/ox-html.el (org-html-format-spec): * lisp/org/ox-publish.el (org-publish-find-date) (org-publish-cache-ctime-of-src): * lisp/pcmpl-gnu.el (pcomplete/tar): * lisp/pcmpl-rpm.el (pcmpl-rpm-packages): * lisp/play/cookie1.el (cookie-snarf): * lisp/progmodes/cmacexp.el (c-macro-expansion): * lisp/ps-bdf.el (bdf-file-mod-time): * lisp/server.el (server-ensure-safe-dir): * lisp/simple.el (shell-command-on-region): * lisp/speedbar.el (speedbar-item-info-file-helper) (speedbar-check-obj-this-line): * lisp/thumbs.el (thumbs-cleanup-thumbsdir): * lisp/time.el (display-time-mail-check-directory) (display-time-file-nonempty-p): * lisp/url/url-cache.el (url-is-cached): * lisp/url/url-file.el (url-file-asynch-callback): * lisp/vc/diff-mode.el (diff-delete-if-empty): * lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): * lisp/vc/vc-cvs.el (vc-cvs-checkout-model) (vc-cvs-state-heuristic, vc-cvs-merge-news) (vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry): * lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1) (vc-hg--ignore-patterns-valid-p) (vc-hg--cached-dirstate-search, vc-hg-state-fast): * lisp/vc/vc-hooks.el (vc-after-save): * lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer): * lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status): * lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file): * lisp/xdg.el (xdg-mime-apps): Prefer (file-attribute-size A) to (nth 7 A), and similarly for other file attributes accessors. * doc/lispref/files.texi (File Attributes): * doc/lispref/intro.texi (Version Info): * doc/lispref/os.texi (Idle Timers): * lisp/erc/erc.el (erc-string-to-emacs-time): * lisp/files.el (file-attribute-access-time) (file-attribute-modification-time) (file-attribute-status-change-time): * lisp/net/tramp-compat.el: (tramp-compat-file-attribute-modification-time) (tramp-compat-file-attribute-size): * src/buffer.c (syms_of_buffer): * src/editfns.c (Fget_internal_run_time): * src/fileio.c (Fvisited_file_modtime) (Fset_visited_file_modtime): * src/keyboard.c (Fcurrent_idle_time): * src/process.c (Fprocess_attributes): Defer implementation details about timestamp format to the section that talks about timestamp format, to make it easier to change the documentation later if timestamp formats are extended. * lisp/gnus/gnus-util.el (gnus-file-newer-than): * lisp/speedbar.el (speedbar-check-obj-this-line): * lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer): Prefer time-less-p to doing it by hand. * lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses. * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Use eql, not eq, to compare integers that might be bignums. * lisp/org/ox-publish.el (org-publish-cache-ctime-of-src): Prefer float-time to doing time arithmetic by hand.
236 lines
8.5 KiB
EmacsLisp
236 lines
8.5 KiB
EmacsLisp
;;; url-file.el --- File retrieval code -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 1996-1999, 2004-2018 Free Software Foundation, Inc.
|
|
|
|
;; Keywords: comm, data, processes
|
|
|
|
;; This file is part of GNU Emacs.
|
|
;;
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'mailcap)
|
|
(require 'url-vars)
|
|
(require 'url-parse)
|
|
(require 'url-dired)
|
|
(declare-function mm-disable-multibyte "mm-util" ())
|
|
|
|
(defconst url-file-default-port 21 "Default FTP port.")
|
|
(defconst url-file-asynchronous-p t "FTP transfers are asynchronous.")
|
|
(defalias 'url-file-expand-file-name 'url-default-expander)
|
|
|
|
(defun url-file-find-possibly-compressed-file (fname &rest _)
|
|
"Find the exact file referenced by `fname'.
|
|
This tries the common compression extensions, because things like
|
|
ange-ftp and efs are not quite smart enough to realize when a server
|
|
can do automatic decompression for them, and won't find 'foo' if
|
|
'foo.gz' exists, even though the FTP server would happily serve it up
|
|
to them."
|
|
(let ((scratch nil)
|
|
(compressed-extensions '("" ".gz" ".z" ".Z" ".bz2" ".xz"))
|
|
(found nil))
|
|
(while (and compressed-extensions (not found))
|
|
(if (file-exists-p (setq scratch (concat fname (pop compressed-extensions))))
|
|
(setq found scratch)))
|
|
found))
|
|
|
|
(defun url-file-host-is-local-p (host)
|
|
"Return t if HOST references our local machine."
|
|
(let ((case-fold-search t))
|
|
(or
|
|
(null host)
|
|
(string= "" host)
|
|
(equal (downcase host) (downcase (system-name)))
|
|
(and (string-match "^localhost$" host) t)
|
|
(and (not (string-match (regexp-quote ".") host))
|
|
(equal (downcase host) (if (string-match (regexp-quote ".")
|
|
(system-name))
|
|
(substring (system-name) 0
|
|
(match-beginning 0))
|
|
(system-name)))))))
|
|
|
|
(defun url-file-asynch-callback (_x _y name buff func args &optional efs)
|
|
(if (not (featurep 'ange-ftp))
|
|
;; EFS passes us an extra argument
|
|
(setq name buff
|
|
buff func
|
|
func args
|
|
args efs))
|
|
(let ((size (file-attribute-size (file-attributes name))))
|
|
(with-current-buffer buff
|
|
(goto-char (point-max))
|
|
(if (/= -1 size)
|
|
(insert (format "Content-length: %d\n" size)))
|
|
(insert "\n")
|
|
(insert-file-contents-literally name)
|
|
(if (not (url-file-host-is-local-p (url-host url-current-object)))
|
|
(condition-case ()
|
|
(delete-file name)
|
|
(error nil)))
|
|
(apply func args))))
|
|
|
|
(declare-function ange-ftp-set-passwd "ange-ftp" (host user passwd))
|
|
(declare-function ange-ftp-copy-file-internal "ange-ftp"
|
|
(filename newname ok-if-already-exists
|
|
keep-date &optional msg cont nowait))
|
|
|
|
(defun url-file-build-filename (url)
|
|
(if (not (url-p url))
|
|
(setq url (url-generic-parse-url url)))
|
|
(let* ((user (url-user url))
|
|
(pass (url-password url))
|
|
(port (url-port url))
|
|
(host (url-host url))
|
|
(site (if (and port (/= port 21))
|
|
(if (featurep 'ange-ftp)
|
|
(format "%s %d" host port)
|
|
;; This works in Emacs 21's ange-ftp too.
|
|
(format "%s#%d" host port))
|
|
host))
|
|
(file (url-unhex-string (url-filename url)))
|
|
(filename (cond
|
|
;; ftp: URL.
|
|
((or user (not (url-file-host-is-local-p host)))
|
|
(concat "/" (or user "anonymous") "@" site ":" file))
|
|
;; file: URL on Windows.
|
|
((and (string-match "\\`/[a-zA-Z]:/" file)
|
|
(memq system-type '(ms-dos windows-nt)))
|
|
(substring file 1))
|
|
;; file: URL with a file:/bar:/foo-like spec.
|
|
((string-match "\\`/[^/]+:/" file)
|
|
(concat "/:" file))
|
|
(t
|
|
file))))
|
|
|
|
(and user pass
|
|
(cond
|
|
((featurep 'ange-ftp)
|
|
(ange-ftp-set-passwd host user pass))
|
|
((when (featurep 'xemacs)
|
|
(or (featurep 'efs) (featurep 'efs-auto)
|
|
(efs-set-passwd host user pass))))
|
|
(t
|
|
nil)))
|
|
|
|
;; This makes sure that directories have a trailing directory
|
|
;; separator on them so URL expansion works right.
|
|
;;
|
|
;; FIXME? What happens if the remote system doesn't use our local
|
|
;; directory-sep-char as its separator? Would it be safer to just
|
|
;; use '/' unconditionally and rely on the FTP server to
|
|
;; straighten it out for us?
|
|
;; (if (and (file-directory-p filename)
|
|
;; (not (string-match (format "%c$" directory-sep-char) filename)))
|
|
;; (setf (url-filename url)
|
|
;; (format "%s%c" filename directory-sep-char)))
|
|
(if (and (file-directory-p filename)
|
|
(not (string-match "/\\'" filename)))
|
|
(setf (url-filename url) (format "%s/" filename)))
|
|
|
|
filename))
|
|
|
|
;;;###autoload
|
|
(defun url-file (url callback cbargs)
|
|
"Handle file: and ftp: URLs."
|
|
(let* ((buffer nil)
|
|
(uncompressed-filename nil)
|
|
(content-type nil)
|
|
(content-encoding nil)
|
|
(coding-system-for-read 'binary)
|
|
(filename (url-file-build-filename url)))
|
|
(or filename (error "File does not exist: %s" (url-recreate-url url)))
|
|
;; Need to figure out the content-type from the real extension,
|
|
;; not the compressed one.
|
|
;; FIXME should this regexp not include more extensions; basically
|
|
;; everything that url-file-find-possibly-compressed-file does?
|
|
(setq uncompressed-filename (if (string-match "\\.\\(gz\\|Z\\|z\\)$" filename)
|
|
(substring filename 0 (match-beginning 0))
|
|
filename))
|
|
(setq content-type (mailcap-extension-to-mime
|
|
(url-file-extension uncompressed-filename))
|
|
content-encoding (pcase (url-file-extension filename)
|
|
((or ".z" ".gz") "gzip")
|
|
(".Z" "compress")
|
|
(".uue" "x-uuencoded")
|
|
(".hqx" "x-hqx")
|
|
(".bz2" "x-bzip2")
|
|
(".xz" "x-xz")
|
|
(_ nil)))
|
|
|
|
(if (file-directory-p filename)
|
|
;; A directory is done the same whether we are local or remote
|
|
(url-find-file-dired filename)
|
|
(with-current-buffer
|
|
(setq buffer (generate-new-buffer " *url-file*"))
|
|
(require 'mm-util)
|
|
(mm-disable-multibyte)
|
|
(setq url-current-object url)
|
|
(insert "Content-type: " (or content-type "application/octet-stream") "\n")
|
|
(if content-encoding
|
|
(insert "Content-transfer-encoding: " content-encoding "\n"))
|
|
(if (url-file-host-is-local-p (url-host url))
|
|
;; Local files are handled slightly oddly
|
|
(if (featurep 'ange-ftp)
|
|
(url-file-asynch-callback nil nil
|
|
filename
|
|
(current-buffer)
|
|
callback cbargs)
|
|
(url-file-asynch-callback nil nil nil
|
|
filename
|
|
(current-buffer)
|
|
callback cbargs))
|
|
;; FTP handling
|
|
(let ((new (make-temp-file
|
|
(format "url-tmp.%d" (user-real-uid)))))
|
|
(if (featurep 'ange-ftp)
|
|
(ange-ftp-copy-file-internal filename (expand-file-name new) t
|
|
nil t
|
|
(list #'url-file-asynch-callback
|
|
new (current-buffer)
|
|
callback cbargs)
|
|
t)
|
|
(when (featurep 'xemacs)
|
|
(autoload 'efs-copy-file-internal "efs")
|
|
(efs-copy-file-internal filename (efs-ftp-path filename)
|
|
new (efs-ftp-path new)
|
|
t nil 0
|
|
(list #'url-file-asynch-callback
|
|
new (current-buffer)
|
|
callback cbargs)
|
|
0 nil)))))))
|
|
buffer))
|
|
|
|
(defmacro url-file-create-wrapper (method args)
|
|
`(defalias ',(intern (format "url-ftp-%s" method))
|
|
(defun ,(intern (format "url-file-%s" method)) ,args
|
|
,(format "FTP/FILE URL wrapper around `%s' call." method)
|
|
(setq url (url-file-build-filename url))
|
|
(and url (,method ,@(remove '&rest (remove '&optional args)))))))
|
|
|
|
(url-file-create-wrapper file-exists-p (url))
|
|
(url-file-create-wrapper file-attributes (url &optional id-format))
|
|
(url-file-create-wrapper file-symlink-p (url))
|
|
(url-file-create-wrapper file-readable-p (url))
|
|
(url-file-create-wrapper file-writable-p (url))
|
|
(url-file-create-wrapper file-executable-p (url))
|
|
(url-file-create-wrapper directory-files (url &optional full match nosort))
|
|
(url-file-create-wrapper file-truename (url &optional counter prev-dirs))
|
|
|
|
(provide 'url-file)
|
|
|
|
;;; url-file.el ends here
|