[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 2/3] Add %X option to printf functions
From: |
Steve McIntyre |
Subject: |
Re: [PATCH 2/3] Add %X option to printf functions |
Date: |
Sat, 5 Oct 2019 02:47:23 +0100 |
User-agent: |
Mutt/1.10.1 (2018-07-13) |
On Sat, Oct 05, 2019 at 12:44:26AM +0200, Javier Martinez Canillas wrote:
>From: Paulo Flabiano Smorigo <address@hidden>
>
>The printf(3) function has support for the %X format specifier, to output
>an unsigned hexadecimal integer in uppercase.
>
>This can be achived in GRUB using the %x format specifier in grub_printf()
>and calling grub_toupper(), but it is more convenient if there is support
>for %X in grub_printf().
>
>Signed-off-by: Paulo Flabiano Smorigo <address@hidden>
>Signed-off-by: Javier Martinez Canillas <address@hidden>
>---
>
> grub-core/kern/misc.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
>index 3b633d51f4c..76e7fb22872 100644
>--- a/grub-core/kern/misc.c
>+++ b/grub-core/kern/misc.c
>@@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d,
>grub_uint64_t *r)
> static inline char *
> grub_lltoa (char *str, int c, unsigned long long n)
> {
>- unsigned base = (c == 'x') ? 16 : 10;
>+ unsigned base = ((c == 'x') || (c == 'X')) ? 16 : 10;
> char *p;
>
> if ((long long) n < 0 && c == 'd')
>@@ -603,7 +603,7 @@ grub_lltoa (char *str, int c, unsigned long long n)
> do
> {
> unsigned d = (unsigned) (n & 0xf);
>- *p++ = (d > 9) ? d + 'a' - 10 : d + '0';
>+ *p++ = (d > 9) ? d + ((c == 'x') ? 'a' : 'A') - 10 : d + '0';
> }
> while (n >>= 4);
> else
>@@ -676,6 +676,7 @@ parse_printf_args (const char *fmt0, struct printf_args
>*args,
> {
> case 'p':
> case 'x':
>+ case 'X':
> case 'u':
> case 'd':
> case 'c':
>@@ -762,6 +763,7 @@ parse_printf_args (const char *fmt0, struct printf_args
>*args,
> switch (c)
> {
> case 'x':
>+ case 'X':
> case 'u':
> args->ptr[curn].type = UNSIGNED_INT + longfmt;
> break;
>@@ -900,6 +902,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const
>char *fmt0,
> c = 'x';
> /* Fall through. */
> case 'x':
>+ case 'X':
> case 'u':
> case 'd':
> {
Ummm, isn't this exactly the same patch that Colin Watson proposed and
I reviewed back in March, as part of his changeset for UEFI?
https://lists.gnu.org/archive/html/grub-devel/2019-03/msg00121.html
Oh, that never got applied. :-(
--
Steve McIntyre, Cambridge, UK. address@hidden
Mature Sporty Personal
More Innovation More Adult
A Man in Dandism
Powered Midship Specialty
- [PATCH 0/3] Search for specific config files using UUID, MAC and IP, Javier Martinez Canillas, 2019/10/04
- [PATCH 1/3] Set net_<interface>_client{id, uuid} variables from DHCP options, Javier Martinez Canillas, 2019/10/04
- [PATCH 2/3] Add %X option to printf functions, Javier Martinez Canillas, 2019/10/04
- [PATCH 3/3] Search for specific config files for netboot, Javier Martinez Canillas, 2019/10/04
- Re: [PATCH 0/3] Search for specific config files using UUID, MAC and IP, Daniel Kiper, 2019/10/15