diff mbox

_dl_exception_create_format: Support %x/%lx/%Zx

Message ID 20181122173812.9025-1-hjl.tools@gmail.com
State New
Headers show

Commit Message

H.J. Lu Nov. 22, 2018, 5:38 p.m. UTC
Add support for %x, %lx and %Zx to _dl_exception_create_format and pad
to the full width with 0.

	* elf/dl-exception.c (_dl_exception_create_format): Support
	%x, %lx and %Zx.
---
 elf/dl-exception.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

Comments

Szabolcs Nagy Nov. 23, 2018, 10:53 a.m. UTC | #1
On 22/11/18 17:38, H.J. Lu wrote:
> Add support for %x, %lx and %Zx to _dl_exception_create_format and pad

> to the full width with 0.

> 

> 	* elf/dl-exception.c (_dl_exception_create_format): Support

> 	%x, %lx and %Zx.


why Z and not z?  the glibc man says

" Z   A nonstandard synonym for z that predates the appearance of z.
  Do not use in new code."
diff mbox

Patch

diff --git a/elf/dl-exception.c b/elf/dl-exception.c
index 1c63e4a3a6..2144998261 100644
--- a/elf/dl-exception.c
+++ b/elf/dl-exception.c
@@ -111,6 +111,20 @@  _dl_exception_create_format (struct dl_exception *exception, const char *objname
             case 's':
               length += strlen (va_arg (ap, const char *));
               break;
+	      /* Recognize the l modifier.  It is only important on some
+		 platforms where long and int have a different size.  We
+		 can use the same code for size_t.  */
+	    case 'l':
+	    case 'Z':
+	      if (p[1] == 'x')
+		{
+		  length += LONG_WIDTH / 4;
+		  ++p;
+		  break;
+		}
+	    case 'x':
+	      length += INT_WIDTH / 4;
+	      break;
             default:
               /* Assumed to be '%'.  */
               ++length;
@@ -167,6 +181,32 @@  _dl_exception_create_format (struct dl_exception *exception, const char *objname
               *wptr = '%';
               ++wptr;
               break;
+	    case 'x':
+	      {
+		unsigned long int num = va_arg (ap, unsigned int);
+		char *start = wptr;
+		wptr += INT_WIDTH / 4;
+		char *cp = _itoa (num, wptr, 16, 0);
+		/* Pad to the full width with 0.  */
+		while (cp != start)
+		  *--cp = '0';
+	      }
+	      break;
+	    case 'l':
+	    case 'Z':
+	      if (p[1] == 'x')
+		{
+		  unsigned long int num = va_arg (ap, unsigned long int);
+		  char *start = wptr;
+		  wptr += LONG_WIDTH / 4;
+		  char *cp = _itoa (num, wptr, 16, 0);
+		  /* Pad to the full width with 0.  */
+		  while (cp != start)
+		    *--cp = '0';
+		  ++p;
+		  break;
+		}
+	       /* FALLTHROUGH */
             default:
               _dl_fatal_printf ("Fatal error:"
                                 " invalid format in exception string\n");