From: "Jiří Wolker via Grub-devel" <grub-devel@gnu.org>
To: grub-devel@gnu.org
Cc: "Jiří Wolker" <projects@jwo.cz>
Subject: [PATCH v2 2/3] Option to set title of submenus
Date: Mon, 26 May 2025 18:15:21 +0200 [thread overview]
Message-ID: <87a56yxlmx.fsf@jwo.cz> (raw)
In-Reply-To: <87plfuz2bb.fsf@gnat.mail-host-address-is-not-set>
---
grub-core/commands/menuentry.c | 47 ++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index 720e6d8ea..c68afae38 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -43,6 +43,9 @@ static const struct grub_arg_option options[] =
anyone can boot it. */
{"unrestricted", 0, 0, N_("This entry can be booted by any user."),
0, ARG_TYPE_NONE},
+ {"menutitle", 0, 0,
+ N_("Use STRING as menu title. When omitted, use the entry label."),
+ N_("TITLE"), ARG_TYPE_STRING},
{0, 0, 0, 0, 0, 0}
};
@@ -252,12 +255,44 @@ setparams_prefix (int argc, char **args)
return result;
}
+static char *
+menutitle_prefix (char *old_prefix, const char *title)
+{
+ const char *t;
+ char *p;
+ char *result;
+ grub_size_t len = 22;
+ grub_size_t old_len = grub_strlen (old_prefix);
+
+ /* Count resulting string length. */
+ for (t = title; *t; t++)
+ len += (*t++ == '\'' ? 4 : 1);
+
+ result = grub_malloc (old_len + len + 2);
+ if (! result)
+ return 0;
+
+ p = result;
+ grub_strcpy (p, old_prefix);
+ p = result + old_len;
+ grub_strcpy (p, "set grub_menu_title='");
+ p += 21;
+
+ p = grub_strchrsub (p, title, '\'', "'\\''");
+ *p++ = '\'';
+ *p++ = '\n';
+ *p = '\0';
+
+ return result;
+}
+
static grub_err_t
grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
{
char ch;
char *src;
char *prefix;
+ char *old_prefix;
unsigned len;
grub_err_t r;
const char *users;
@@ -299,6 +334,18 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
if (! prefix)
return grub_errno;
+ /* Prepend the menu title line. */
+ if (ctxt->state[6].arg)
+ {
+ old_prefix = prefix;
+ prefix = menutitle_prefix (old_prefix, (ctxt->state[6].arg
+ && grub_strlen (ctxt->state[6].arg) > 0)
+ ? ctxt->state[6].arg : args[0]);
+ if (! prefix)
+ return grub_errno;
+ grub_free (old_prefix);
+ }
+
r = grub_normal_add_menu_entry (argc - 1, (const char **) args,
ctxt->state[0].args, ctxt->state[4].arg,
users,
--
2.45.3
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
next prev parent reply other threads:[~2025-05-27 12:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-27 11:54 [PATCH v2 0/3] Allow script-configurable GRUB menu title Jiří 'bindiff' Wolker via Grub-devel
2025-05-25 19:55 ` [PATCH v2 1/3] Customization of " Jiří Wolker via Grub-devel
2025-05-26 16:15 ` Jiří Wolker via Grub-devel [this message]
2025-05-27 13:14 ` [PATCH v2 2/3] Option to set title of submenus Vladimir 'phcoder' Serbinenko
2025-05-27 13:18 ` Jiří 'bindiff' Wolker via Grub-devel
2025-05-26 16:21 ` [PATCH v2 3/3] Documentation for the --menutitle option Jiří ‘bindiff’ Wolker via Grub-devel
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=87a56yxlmx.fsf@jwo.cz \
--to=grub-devel@gnu.org \
--cc=projects@jwo.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.