unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#47547: 28.0.50; [PATCH] Eshell cannot 'cd' in directory with 'eshell' as name
@ 2021-04-01 14:52 Utkarsh Singh
  2021-04-05 16:04 ` Lars Ingebrigtsen
  0 siblings, 1 reply; 2+ messages in thread
From: Utkarsh Singh @ 2021-04-01 14:52 UTC (permalink / raw)
  To: 47547

Reproduce the error:

(setq eshell-cd-on-directory t) ; in-case you have changed the defaults

Invoke eshell and enter the following commands:

$ /usr/local/share/emacs/28.0.50/lisp/eshell
Read error: Is a directory, /usr/local/share/emacs/28.0.50/lisp/eshell

OR

$ mkdir /tmp/eshell
$ /tmp/eshell
Read error: Is a directory, /tmp/eshell/

So where is the problem?

Checking `eshell-interpreter-alist' value:
((eshell-visual-command-p . eshell-exec-visual)
 ((closure
   (t)
   (file _args)
    (string= (file-name-nondirectory file)
    "eshell"))
  . eshell/source)
 (#f(compiled-function
     (file args)
     #<bytecode -0x47e9576cc9960d2>)
    . eshell-dirs-substitute-cd))
    
We can see eshell is using `file-name-nondirectory' to source file which
leads to the read error.  I suggest to add one more check before
loading file from `eshell/source'. One example of such check is
`file-regular-p' check and hence I drafted this patch.

diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index aecc48610f..6e6ae1229e 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -60,8 +60,9 @@ eshell-script-initialize
   "Initialize the script parsing code."
   (setq-local eshell-interpreter-alist
 	(cons (cons #'(lambda (file _args)
-                        (string= (file-name-nondirectory file)
-                                 "eshell"))
+                        (and (file-regular-p file)
+                             (string= (file-name-nondirectory file))
+                             "eshell"))
                     'eshell/source)
 	      eshell-interpreter-alist))
   (setq-local eshell-complex-commands
-- 
Utkarsh Singh
utkarshsingh.xyz





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#47547: 28.0.50; [PATCH] Eshell cannot 'cd' in directory with 'eshell' as name
  2021-04-01 14:52 bug#47547: 28.0.50; [PATCH] Eshell cannot 'cd' in directory with 'eshell' as name Utkarsh Singh
@ 2021-04-05 16:04 ` Lars Ingebrigtsen
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Ingebrigtsen @ 2021-04-05 16:04 UTC (permalink / raw)
  To: Utkarsh Singh; +Cc: 47547

Utkarsh Singh <utkarsh190601@gmail.com> writes:

> We can see eshell is using `file-name-nondirectory' to source file which
> leads to the read error.  I suggest to add one more check before
> loading file from `eshell/source'. One example of such check is
> `file-regular-p' check and hence I drafted this patch.

Thanks; applied to Emacs 28.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-04-05 16:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-01 14:52 bug#47547: 28.0.50; [PATCH] Eshell cannot 'cd' in directory with 'eshell' as name Utkarsh Singh
2021-04-05 16:04 ` Lars Ingebrigtsen

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).