mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

When using Eshell's "du" implementation, deduplicate hard links

Browse Source 
* lisp/eshell/em-unix.el (eshell-du-sum-directory): Take SEEN-FILES.
(eshell/du): Create 'seen-files' hash table.
This commit is contained in:
Jim Porter 2024-11-09 16:06:34 -08:00
parent 37c583a2c2
commit 1704fa4fb4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/eshell/em-unix.el
View File

@ -860,11 +860,15 @@ external command."
(cl-defun eshell-du-sum-directory (path depth-remaining &rest args
&key print-function show-all
dereference-links only-one-filesystem)
dereference-links only-one-filesystem
seen-files)
"Summarize PATH, and its member directories."
(let ((size 0.0))
(dolist (entry (eshell-directory-files-and-attributes path))
(unless (string-match "\\`\\.\\.?\\'" (car entry))
(unless (or (string-match "\\`\\.\\.?\\'" (car entry))
(gethash (file-attribute-file-identifier (cdr entry))
seen-files))
(puthash (file-attribute-file-identifier (cdr entry)) t seen-files)
(let* ((file-name (concat path "/" (car entry)))
(file-type (file-attribute-type (cdr entry)))
(symlink (and (stringp file-type) file-type)))
@ -938,6 +942,7 @@ Summarize disk usage of each FILE, recursively for directories.")
(when (eshell-under-windows-p)
(setq only-one-filesystem nil))
(let ((size 0.0)
(seen-files (make-hash-table :test #'equal))
(print-function
(lambda (size name)
(let ((size-str (eshell-printable-size size human-readable
@ -952,7 +957,8 @@ Summarize disk usage of each FILE, recursively for directories.")
(directory-file-name arg) max-depth
:print-function print-function :show-all show-all
:dereference-links dereference-links
:only-one-filesystem only-one-filesystem))))
:only-one-filesystem only-one-filesystem
:seen-files seen-files))))
(when grand-total
(funcall print-function size "total"))))))