From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: zsh-workers@zsh.org
Subject: Re: [BUG] zf_ln complains about the wrong argument
Date: Sun, 22 Aug 2021 21:24:51 +0100 [thread overview]
Message-ID: <a057e3c27fbc5a0b130eef7fbc554b98f7f8a1b1.camel@ntlworld.com> (raw)
In-Reply-To: <CAHLkEDtzSMGfxudX9Lfr+dh5i94y-mX5omdEC28Fi+xxE72DkQ@mail.gmail.com>
On Sun, 2021-08-22 at 16:45 +0300, Marlon Richert wrote:
> When the second argument to zf_ln is an empty string, zf_ln mistakenly
> reports that the first argument is a non-existing file or dir:
>
> % zmodload zsh/files
> % touch foo
> % zf_ln foo ''
> zf_ln: foo: no such file or directory
Is this good enough to detect cases like this? An extra stat in the
error case should be neither here nor there.
Also seems a good idea to turn a null string into a couple of quotes. I
thought of modifying the error message handler but this has too many
knock on effects.
pws
diff --git a/Src/Modules/files.c b/Src/Modules/files.c
index a1d6f6bf2..d4ec93624 100644
--- a/Src/Modules/files.c
+++ b/Src/Modules/files.c
@@ -346,7 +346,16 @@ domove(char *nam, MoveFunc movefn, char *p, char *q, int flags)
unlink(qbuf);
}
if(movefn(pbuf, qbuf)) {
- zwarnnam(nam, "%s: %e", p, errno);
+ int ferrno = errno;
+ char *errfile = p;
+ if (ferrno == ENOENT && !lstat(pbuf, &st)) {
+ /* p *does* exist, so error is in q */
+ errfile = q;
+ }
+ if (*errfile)
+ zwarnnam(nam, "%s: %e", errfile, ferrno);
+ else
+ zwarnnam(nam, "`': %e", ferrno);
zsfree(pbuf);
return 1;
}
next prev parent reply other threads:[~2021-08-22 20:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-22 13:45 Marlon Richert
2021-08-22 15:35 ` Mikael Magnusson
2021-08-22 19:27 ` Marlon Richert
2021-08-22 20:24 ` Peter Stephenson [this message]
2021-08-22 21:05 ` Daniel Shahaf
2021-08-23 8:33 ` Peter Stephenson
2021-08-24 13:04 ` Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a057e3c27fbc5a0b130eef7fbc554b98f7f8a1b1.camel@ntlworld.com \
--to=p.w.stephenson@ntlworld.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).