Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iAFol-00043O-TK for mharc-grub-devel@gnu.org; Tue, 17 Sep 2019 11:55:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38595) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAFoi-0003zY-Tz for grub-devel@gnu.org; Tue, 17 Sep 2019 11:55:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAFoh-0001om-R0 for grub-devel@gnu.org; Tue, 17 Sep 2019 11:55:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61240) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAFoh-0001oV-JK for grub-devel@gnu.org; Tue, 17 Sep 2019 11:54:59 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6F29859451 for ; Tue, 17 Sep 2019 15:54:58 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id r187so883589wme.0 for ; Tue, 17 Sep 2019 08:54:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QcbIc2URnUJjaTnKsDfLOymM6dS+g+QkZBTFEAkfGdg=; b=ZLugXhl75zSkLwJxh37cyOoTqCEAQP64hCbKrHErOFtMWHuzs2GIX05o39FjU4miEK xZpearOcpikHQxi6gODpf3hogj2vZWaF0BG+I5jh41wkWG3bwBFN4SHWY5IAdLzp1dm1 xM+TI8xk9mcU5UxJ8GB2TMxXBv/UyITCtukc3dgQftG+qUhOs0IUkw0q9fdYzNVw+92W S/IgeSCwZxPgkIESEF87QmiwISdpfIebfJs8pEIF0PrLLHUVyQUR+W+sBVDdgqYLh9pH k8PSitBmi6V7i2Q21K/F7uan08q+qfA3anm/wXZHzwPi7yzMoE9vr9RHCCvjnnSCtk4V m5Kw== X-Gm-Message-State: APjAAAXvd8aDUl7FOSIRRDsP7Mcg84i15Frgo1RCb4lytsAb1JdkoqOY s/dJafIdxPUsYFGhvah2pFOIZ1IAwtV01ZXA5PNqRIJJV4tjBUmBmrks/knJVs12HIX3pIvGFyn 72ztiOqbsdcA= X-Received: by 2002:a7b:ce91:: with SMTP id q17mr4068132wmj.25.1568735696751; Tue, 17 Sep 2019 08:54:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqyfGYil2Vo6cihE9KscOa+4FRTPoYYxfr0q4rYregIsnP71Hf5hsR93ZxqSu6vey+aMquYQOg== X-Received: by 2002:a7b:ce91:: with SMTP id q17mr4068118wmj.25.1568735696589; Tue, 17 Sep 2019 08:54:56 -0700 (PDT) Received: from minerva.redhat.com ([90.168.169.92]) by smtp.gmail.com with ESMTPSA id m11sm2725618wrn.59.2019.09.17.08.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 08:54:55 -0700 (PDT) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Paulo Flabiano Smorigo , Javier Martinez Canillas , Vladimir Serbinenko , Daniel Kiper Subject: [PATCH] Add %X option to printf functions. Date: Tue, 17 Sep 2019 17:54:44 +0200 Message-Id: <20190917155444.5691-1-javierm@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2019 15:55:02 -0000 From: Paulo Flabiano Smorigo Signed-off-by: Paulo Flabiano Smorigo Signed-off-by: Javier Martinez Canillas --- 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 =3D (c =3D=3D 'x') ? 16 : 10; + unsigned base =3D ((c =3D=3D 'x') || (c =3D=3D 'X')) ? 16 : 10; char *p; =20 if ((long long) n < 0 && c =3D=3D 'd') @@ -603,7 +603,7 @@ grub_lltoa (char *str, int c, unsigned long long n) do { unsigned d =3D (unsigned) (n & 0xf); - *p++ =3D (d > 9) ? d + 'a' - 10 : d + '0'; + *p++ =3D (d > 9) ? d + ((c =3D=3D 'x') ? 'a' : 'A') - 10 : d + '0'; } while (n >>=3D 4); else @@ -676,6 +676,7 @@ parse_printf_args (const char *fmt0, struct printf_ar= gs *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_ar= gs *args, switch (c) { case 'x': + case 'X': case 'u': args->ptr[curn].type =3D UNSIGNED_INT + longfmt; break; @@ -900,6 +902,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, = const char *fmt0, c =3D 'x'; /* Fall through. */ case 'x': + case 'X': case 'u': case 'd': { --=20 2.21.0