From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh workers <zsh-workers@zsh.org>
Subject: [PATCH] unmetafy Re: $var not expanded in ${x?$var}
Date: Wed, 21 Feb 2024 16:46:23 -0800 [thread overview]
Message-ID: <CAH+w=7ah2tG=QOFDVirAm2PdeX4CXqqjjc+0JinOAG_jkgR6sQ@mail.gmail.com> (raw)
In-Reply-To: <20240221202150.tccftcqbxqqexq4x@chazelas.org>
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
On Wed, Feb 21, 2024 at 12:21 PM Stephane Chazelas
<stephane@chazelas.org> wrote:
>
> > What would you expect it to do? You can't have it both raw and not
> > raw.
>
> I would expect it to write the NUL character ('\0') to stderr
[...]
> Maybe needs some unmetafy + fwrite.
Bleah, the argument to zerrmsg is const char * so can't be passed to
unmetafy without copy.
Is this more like it?
[-- Attachment #2: zerr%S.txt --]
[-- Type: text/plain, Size: 1184 bytes --]
diff --git a/Src/subst.c b/Src/subst.c
index 650c09de2..ddf9f9de9 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -3272,7 +3272,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
*idend = '\0';
if (*s){
singsub(&s);
- zerr("%s: %s", idbeg, s);
+ zerr("%s: %S", idbeg, s);
} else
zerr("%s: %s", idbeg, "parameter not set");
/*
diff --git a/Src/utils.c b/Src/utils.c
index 0fda92709..a15284815 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -123,6 +123,7 @@ set_widearray(char *mb_array, Widechar_array wca)
Code Argument types Prints
%s const char * C string (null terminated)
+ %S const char * C string (null terminated), output raw
%l const char *, int C string of given length (null not required)
%L long decimal value
%d int decimal value
@@ -309,6 +310,10 @@ zerrmsg(FILE *file, const char *fmt, va_list ap)
str = va_arg(ap, const char *);
nicezputs(str, file);
break;
+ case 'S':
+ str = va_arg(ap, const char *);
+ fwrite(unmetafy(dupstring(str), &num), num, 1, file);
+ break;
case 'l': {
char *s;
str = va_arg(ap, const char *);
next prev parent reply other threads:[~2024-02-22 0:47 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 8:02 Stephane Chazelas
2023-01-16 8:35 ` Daniel Shahaf
2023-01-16 17:15 ` Peter Stephenson
2024-02-20 7:05 ` Stephane Chazelas
2024-02-20 17:45 ` Bart Schaefer
2024-02-20 19:39 ` Stephane Chazelas
2024-02-21 4:44 ` Bart Schaefer
2024-02-21 19:45 ` Stephane Chazelas
2024-02-21 19:52 ` Bart Schaefer
2024-02-21 20:21 ` Stephane Chazelas
2024-02-22 0:46 ` Bart Schaefer [this message]
2024-02-22 7:23 ` [PATCH] unmetafy " Stephane Chazelas
2024-02-22 7:55 ` Metafication in error messages (Was: [PATCH] unmetafy Re: $var not expanded in ${x?$var}) Stephane Chazelas
2024-02-22 17:02 ` Bart Schaefer
2024-02-22 22:31 ` Bart Schaefer
2024-02-23 0:49 ` Bart Schaefer
2024-02-23 19:27 ` Stephane Chazelas
2024-02-23 22:32 ` Bart Schaefer
2024-02-23 23:38 ` Bart Schaefer
2024-02-24 9:47 ` Stephane Chazelas
2024-02-24 10:36 ` Stephane Chazelas
2024-02-25 4:35 ` [PATCH] 'bad interpreter' error garbled Bart Schaefer
2024-02-25 5:26 ` Bart Schaefer
2024-02-25 2:17 ` Metafication in error messages (Was: [PATCH] unmetafy Re: $var not expanded in ${x?$var}) Bart Schaefer
2024-02-25 6:05 ` Bart Schaefer
2024-02-25 7:29 ` Stephane Chazelas
2024-02-25 8:28 ` typeset -<non-ASCII> (Was: metafication in error messages) Stephane Chazelas
2024-02-25 8:35 ` Stephane Chazelas
2024-02-25 21:02 ` Bart Schaefer
2024-02-23 0:33 ` Metafication in error messages (Was: [PATCH] unmetafy Re: $var not expanded in ${x?$var}) Bart Schaefer
2024-02-25 5:06 ` [PATCH] count multibyte and metafied characters correctly for math ops errors Bart Schaefer
2024-02-22 8:34 ` [PATCH] unmetafy Re: $var not expanded in ${x?$var} Roman Perepelitsa
2024-02-22 17:07 ` Bart Schaefer
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='CAH+w=7ah2tG=QOFDVirAm2PdeX4CXqqjjc+0JinOAG_jkgR6sQ@mail.gmail.com' \
--to=schaefer@brasslantern.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).