lkml.org 
[lkml]   [2022]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/8] tools/nolibc/stdio: add support for '%p' to vfprintf()
Date
%p remains quite useful in test code, and the code path can easily be
merged with the existing "%x" thus only adds ~50 bytes, thus let's
add it.

Signed-off-by: Willy Tarreau <w@1wt.eu>
---
tools/include/nolibc/stdio.h | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h
index 559ebe052a75..15dedf8d0902 100644
--- a/tools/include/nolibc/stdio.h
+++ b/tools/include/nolibc/stdio.h
@@ -163,7 +163,7 @@ char *fgets(char *s, int size, FILE *stream)


/* minimal vfprintf(). It supports the following formats:
- * - %[l*]{d,u,c,x}
+ * - %[l*]{d,u,c,x,p}
* - %s
* - unknown modifiers are ignored.
*/
@@ -184,8 +184,12 @@ int vfprintf(FILE *stream, const char *fmt, va_list args)
if (escape) {
/* we're in an escape sequence, ofs == 1 */
escape = 0;
- if (c == 'c' || c == 'd' || c == 'u' || c == 'x') {
- if (lpref) {
+ if (c == 'c' || c == 'd' || c == 'u' || c == 'x' || c == 'p') {
+ char *out = tmpbuf;
+
+ if (c == 'p')
+ v = va_arg(args, unsigned long);
+ else if (lpref) {
if (lpref > 1)
v = va_arg(args, unsigned long long);
else
@@ -202,18 +206,22 @@ int vfprintf(FILE *stream, const char *fmt, va_list args)
}

switch (c) {
+ case 'c':
+ out[0] = v;
+ out[1] = 0;
+ break;
case 'd':
- i64toa_r(v, tmpbuf);
+ i64toa_r(v, out);
break;
case 'u':
- u64toa_r(v, tmpbuf);
+ u64toa_r(v, out);
break;
- case 'x':
- u64toh_r(v, tmpbuf);
- break;
- default: /* 'c' */
- tmpbuf[0] = v;
- tmpbuf[1] = 0;
+ case 'p':
+ *(out++) = '0';
+ *(out++) = 'x';
+ /* fall through */
+ default: /* 'x' and 'p' above */
+ u64toh_r(v, out);
break;
}
outstr = tmpbuf;
--
2.35.1
\
 
 \ /
  Last update: 2022-09-17 16:18    [W:0.072 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site