From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/5] Documentation: gen_commands.py: escape special characters
Date: Fri, 24 Oct 2025 11:07:02 +0200 [thread overview]
Message-ID: <20251024090708.2476109-1-a.fatoum@pengutronix.de> (raw)
commands/global.c has following line:
BAREBOX_CMD_HELP_TEXT("Without options, print all global and env
(prefixed with *) variables.")
which triggers a warning as the * has a special meaning in ReST and it
is never terminated.
On the other hand, we have escapes for double quotes, which should be
stripped:
BAREBOX_CMD_HELP_TEXT("- \"bootchooser\": boot with barebox bootchooser")
Fix these and other issues by processing escapes for all strings we extract,
except for those in literal blocks.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Documentation/gen_commands.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/gen_commands.py b/Documentation/gen_commands.py
index 4fcb4dda6e74..53fd59d8f692 100755
--- a/Documentation/gen_commands.py
+++ b/Documentation/gen_commands.py
@@ -26,12 +26,19 @@ CMD_END = re.compile(r"""^BAREBOX_CMD_END\s*$""")
CONT = re.compile(r"""\s*"(.*?)"\s*\)?\s*$""")
+ESCAPE = re.compile(r"""([*_`|<>\\])""")
+UNESCAPE = re.compile(r'''\\(["\\])''')
+
CMDS = {}
+
+def string_escape_literal(s):
+ return re.sub(UNESCAPE, r'\1', s.replace(r'\t', '').replace(r'\n', ''))
+
+
def string_escape(s):
- # This used to do s.decode("string_escape") which isn't available on Python 3.
- # Actually we only need to drop '\t' and '\n', so do this here.
- return s.replace(r'\t', '').replace(r'\n', '')
+ return re.sub(ESCAPE, r'\\\1', string_escape_literal(s))
+
def parse_c(name):
cmd = None
@@ -78,7 +85,7 @@ def parse_c(name):
x = CMD_OPTS.match(line)
if x:
last = cmd['c_opts']
- last.append(string_escape(x.group(1)))
+ last.append(string_escape_literal(x.group(1)))
continue
x = CMD_GROUP.match(line)
if x:
--
2.47.3
next reply other threads:[~2025-10-24 9:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-24 9:07 Ahmad Fatoum [this message]
2025-10-24 9:07 ` [PATCH 2/5] Documentation: gen_commands.py: align whitespace with coding style Ahmad Fatoum
2025-10-24 9:07 ` [PATCH 3/5] Documentation: gen_commands.py: rework if statements for compactness Ahmad Fatoum
2025-10-24 9:07 ` [PATCH 4/5] Documentation: gen_commands.py: use literal block for help text Ahmad Fatoum
2025-10-24 9:07 ` [PATCH 5/5] Documentation: gen_commands.py: escape name in title Ahmad Fatoum
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=20251024090708.2476109-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox