[musl] musl patch for c2x %b printf/scanf

[musl] musl patch for c2x %b printf/scanf

[Andreas Dixius]

[-- Attachment #1.1.1: Type: text/plain, Size: 458 bytes --]

(no mailing list member, so please CC in case of replies I should read)

Hello,

as quite useful to us (a lot of binary value printouts), I added some 
(to the best of my knowledge) patch to musl for c2x-style %b 
printf/scanf formatting. In case you find these useful, feel free to 
integrate/adapt into musl.

Both patches (attached) should be applicable to the current git master 
branch of musl (as of writing this mail).

Regards,
Andreas

[-- Attachment #1.1.2: 0001-add-C2X-b-printf-format.patch --]
[-- Type: text/x-patch, Size: 3240 bytes --]

From 34f4035c45bdeb9b60be4920ce610a2fbf2f8b29 Mon Sep 17 00:00:00 2001
From: Andreas <andreas.dixius@posteo.de>
Date: Wed, 3 Aug 2022 16:41:15 +0200
Subject: [PATCH 1/2] add C2X %b printf format

---
 src/stdio/vfprintf.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index 45557951..93fac121 100644
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -49,7 +49,7 @@ enum {
 static const unsigned char states[]['z'-'A'+1] = {
 	{ /* 0: bare types */
 		S('d') = INT, S('i') = INT,
-		S('o') = UINT, S('u') = UINT, S('x') = UINT, S('X') = UINT,
+		S('o') = UINT, S('u') = UINT, S('x') = UINT, S('X') = UINT, S('b') = UINT,
 		S('e') = DBL, S('f') = DBL, S('g') = DBL, S('a') = DBL,
 		S('E') = DBL, S('F') = DBL, S('G') = DBL, S('A') = DBL,
 		S('c') = CHAR, S('C') = INT,
@@ -59,7 +59,7 @@ static const unsigned char states[]['z'-'A'+1] = {
 		S('z') = ZTPRE, S('j') = JPRE, S('t') = ZTPRE,
 	}, { /* 1: l-prefixed */
 		S('d') = LONG, S('i') = LONG,
-		S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG,
+		S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG, S('b') = ULONG,
 		S('e') = DBL, S('f') = DBL, S('g') = DBL, S('a') = DBL,
 		S('E') = DBL, S('F') = DBL, S('G') = DBL, S('A') = DBL,
 		S('c') = INT, S('s') = PTR, S('n') = PTR,
@@ -68,17 +68,20 @@ static const unsigned char states[]['z'-'A'+1] = {
 		S('d') = LLONG, S('i') = LLONG,
 		S('o') = ULLONG, S('u') = ULLONG,
 		S('x') = ULLONG, S('X') = ULLONG,
+		S('b') = ULLONG,
 		S('n') = PTR,
 	}, { /* 3: h-prefixed */
 		S('d') = SHORT, S('i') = SHORT,
 		S('o') = USHORT, S('u') = USHORT,
 		S('x') = USHORT, S('X') = USHORT,
+		S('b') = USHORT,
 		S('n') = PTR,
 		S('h') = HHPRE,
 	}, { /* 4: hh-prefixed */
 		S('d') = CHAR, S('i') = CHAR,
 		S('o') = UCHAR, S('u') = UCHAR,
 		S('x') = UCHAR, S('X') = UCHAR,
+		S('b') = UCHAR,
 		S('n') = PTR,
 	}, { /* 5: L-prefixed */
 		S('e') = LDBL, S('f') = LDBL, S('g') = LDBL, S('a') = LDBL,
@@ -88,11 +91,13 @@ static const unsigned char states[]['z'-'A'+1] = {
 		S('d') = PDIFF, S('i') = PDIFF,
 		S('o') = SIZET, S('u') = SIZET,
 		S('x') = SIZET, S('X') = SIZET,
+		S('b') = SIZET,
 		S('n') = PTR,
 	}, { /* 7: j-prefixed */
 		S('d') = IMAX, S('i') = IMAX,
 		S('o') = UMAX, S('u') = UMAX,
 		S('x') = UMAX, S('X') = UMAX,
+		S('b') = UMAX,
 		S('n') = PTR,
 	}
 };
@@ -162,6 +167,12 @@ static char *fmt_o(uintmax_t x, char *s)
 	return s;
 }
 
+static char *fmt_b(uintmax_t x, char *s)
+{
+	for (; x; x>>=1) *--s = '0' + (x&1);
+	return s;
+}
+
 static char *fmt_u(uintmax_t x, char *s)
 {
 	unsigned long y;
@@ -531,7 +542,7 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 		if (!f) continue;
 
 		z = buf + sizeof(buf);
-		prefix = "-+   0X0x";
+		prefix = "-+   0X0x0b";
 		pl = 0;
 		t = s[-1];
 
@@ -565,6 +576,10 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg,
 			a = fmt_o(arg.i, z);
 			if ((fl&ALT_FORM) && p<z-a+1) p=z-a+1;
 			} if (0) {
+		case 'b':
+			a = fmt_b(arg.i, z);
+			if (arg.i && (fl & ALT_FORM)) prefix+=9, pl=2;
+			} if (0) {
 		case 'd': case 'i':
 			pl=1;
 			if (arg.i>INTMAX_MAX) {
-- 
2.39.2


[-- Attachment #1.1.3: 0002-add-C2X-b-scanf-format.patch --]
[-- Type: text/x-patch, Size: 1791 bytes --]

From 1953f6b70c4738c79cea76efda3853beb41bc52b Mon Sep 17 00:00:00 2001
From: Andreas <andreas.dixius@posteo.de>
Date: Thu, 4 Aug 2022 10:28:45 +0200
Subject: [PATCH 2/2] add C2X %b scanf format

---
 src/internal/intscan.c | 10 +++++++---
 src/stdio/vfscanf.c    |  5 ++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/internal/intscan.c b/src/internal/intscan.c
index a4a5ae86..74c13be0 100644
--- a/src/internal/intscan.c
+++ b/src/internal/intscan.c
@@ -40,15 +40,19 @@ unsigned long long __intscan(FILE *f, unsigned base, int pok, unsigned long long
 	}
 	if ((base == 0 || base == 16) && c=='0') {
 		c = shgetc(f);
-		if ((c|32)=='x') {
+		if (((c|32)=='x') || (c == 'b')) {
+            if (c == 'b') {
+                base = 2;
+            } else {
+                base = 16;
+            }
 			c = shgetc(f);
-			if (val[c]>=16) {
+			if (val[c]>=base) {
 				shunget(f);
 				if (pok) shunget(f);
 				else shlim(f, 0);
 				return 0;
 			}
-			base = 16;
 		} else if (base == 0) {
 			base = 8;
 		}
diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c
index b78a374d..420f005a 100644
--- a/src/stdio/vfscanf.c
+++ b/src/stdio/vfscanf.c
@@ -151,7 +151,7 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap)
 			size = SIZE_L;
 			break;
 		case 'd': case 'i': case 'o': case 'u': case 'x':
-		case 'a': case 'e': case 'f': case 'g':
+		case 'a': case 'e': case 'f': case 'g': case 'b':
 		case 'A': case 'E': case 'F': case 'G': case 'X':
 		case 's': case 'c': case '[':
 		case 'S': case 'C':
@@ -286,6 +286,9 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap)
 		case 'o':
 			base = 8;
 			goto int_common;
+		case 'b':
+			base = 2;
+			goto int_common;
 		case 'd':
 		case 'u':
 			base = 10;
-- 
2.39.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [musl] musl patch for c2x %b printf/scanf

[Jₑₙₛ Gustedt]

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

Hallo Andreas,
thanks for launching this.

In this range there are still some changes that will be applied to the
final C23 standard. WG14 has now added

 - PRI and SCN macros for 'b' conversions
 - Made a conversion 'B' for `printf` similar to 'X'. This is optional
   but recommended if the implementation did not use that character
   previously for their own stuff.
 - Depending on that option implement the PRI and SCN macros also for
   'B', with the intent that they then are also feature test macros
   for that.

Thanks
Jₑₙₛ

-- 
:: ICube :::::::::::::::::::::::::::::: deputy director ::
:: Université de Strasbourg :::::::::::::::::::::: ICPS ::
:: INRIA Nancy Grand Est :::::::::::::::::::::::: Camus ::
:: :::::::::::::::::::::::::::::::::::: ☎ +33 368854536 ::
:: https://icube-icps.unistra.fr/index.php/Jens_Gustedt ::

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [musl] musl patch for c2x %b printf/scanf

[enh]

On Fri, Mar 3, 2023 at 3:03 AM Jₑₙₛ Gustedt <jens.gustedt@inria.fr> wrote:
>
> Hallo Andreas,
> thanks for launching this.
>
> In this range there are still some changes that will be applied to the
> final C23 standard. WG14 has now added
>
>  - PRI and SCN macros for 'b' conversions

do you have a reference for that? is there a newer version than
https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2630.pdf ?

>  - Made a conversion 'B' for `printf` similar to 'X'. This is optional
>    but recommended if the implementation did not use that character
>    previously for their own stuff.
>  - Depending on that option implement the PRI and SCN macros also for
>    'B', with the intent that they then are also feature test macros
>    for that.
>
> Thanks
> Jₑₙₛ
>
> --
> :: ICube :::::::::::::::::::::::::::::: deputy director ::
> :: Université de Strasbourg :::::::::::::::::::::: ICPS ::
> :: INRIA Nancy Grand Est :::::::::::::::::::::::: Camus ::
> :: :::::::::::::::::::::::::::::::::::: ☎ +33 368854536 ::
> :: https://icube-icps.unistra.fr/index.php/Jens_Gustedt ::

Re: [musl] musl patch for c2x %b printf/scanf

[Jₑₙₛ Gustedt]

[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]

Hello,

on Fri, 3 Mar 2023 08:43:26 -0800 you (enh <enh@google.com>) wrote:


> do you have a reference for that? is there a newer version than
> https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2630.pdf ?

The latest version before CD1 ballot is

    https://open-std.org/JTC1/SC22/WG14/www/docs/n3088.pdf

The raw result of that ballot process can be found here

    https://open-std.org/JTC1/SC22/WG14/www/docs/n3108.doc

Unfortunately the integration of all of this is not yet ready, it
seems, but should be in a week or two.

A listing with all documents, such as meeting minutes can be found
here:

    https://open-std.org/JTC1/SC22/WG14/www/wg14_document_log

For the feature at hand, 'b' and 'B' specifiers, the late changes
where initiated by our comments from France (AFNOR), starting here:

      https://open-std.org/JTC1/SC22/WG14/www/docs/n3072.htm#pri-and-scn-macros-are-missing-for-new-format-specifiers

While there still could be some minor changes in CD2 ballot phase, I
don't expect that there will be as much as for CD1, and everything
should stabilize fairly quickly.

Thanks
Jₑₙₛ

-- 
:: ICube :::::::::::::::::::::::::::::: deputy director ::
:: Université de Strasbourg :::::::::::::::::::::: ICPS ::
:: INRIA Nancy Grand Est :::::::::::::::::::::::: Camus ::
:: :::::::::::::::::::::::::::::::::::: ☎ +33 368854536 ::
:: https://icube-icps.unistra.fr/index.php/Jens_Gustedt ::

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [musl] musl patch for c2x %b printf/scanf

[enh]

thanks! i've added those to bionic's inttypes.h (including the B ones,
since i did implement %B) in
https://android-review.googlesource.com/c/platform/bionic/+/2472606.

(i've also filed a bug to make sure we actually implement 'w' and
'wf', since i keep forgetting about them, having much less use for
them personally than %b, which -- along with #embed -- i've wanted
since the 1980s!)



On Sat, Mar 4, 2023 at 3:15 AM Jₑₙₛ Gustedt <jens.gustedt@inria.fr> wrote:
>
> Hello,
>
> on Fri, 3 Mar 2023 08:43:26 -0800 you (enh <enh@google.com>) wrote:
>
>
> > do you have a reference for that? is there a newer version than
> > https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2630.pdf ?
>
> The latest version before CD1 ballot is
>
>     https://open-std.org/JTC1/SC22/WG14/www/docs/n3088.pdf
>
> The raw result of that ballot process can be found here
>
>     https://open-std.org/JTC1/SC22/WG14/www/docs/n3108.doc
>
> Unfortunately the integration of all of this is not yet ready, it
> seems, but should be in a week or two.
>
> A listing with all documents, such as meeting minutes can be found
> here:
>
>     https://open-std.org/JTC1/SC22/WG14/www/wg14_document_log
>
> For the feature at hand, 'b' and 'B' specifiers, the late changes
> where initiated by our comments from France (AFNOR), starting here:
>
>       https://open-std.org/JTC1/SC22/WG14/www/docs/n3072.htm#pri-and-scn-macros-are-missing-for-new-format-specifiers
>
> While there still could be some minor changes in CD2 ballot phase, I
> don't expect that there will be as much as for CD1, and everything
> should stabilize fairly quickly.
>
> Thanks
> Jₑₙₛ
>
> --
> :: ICube :::::::::::::::::::::::::::::: deputy director ::
> :: Université de Strasbourg :::::::::::::::::::::: ICPS ::
> :: INRIA Nancy Grand Est :::::::::::::::::::::::: Camus ::
> :: :::::::::::::::::::::::::::::::::::: ☎ +33 368854536 ::
> :: https://icube-icps.unistra.fr/index.php/Jens_Gustedt ::