aboutsummaryrefslogtreecommitdiffstats
path: root/lib/vsprintf.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/vsprintf.c')
-rw-r--r--lib/vsprintf.c589
1 files changed, 373 insertions, 216 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 33bed5e67a21..24112e5a5780 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -9,7 +9,7 @@
9 * Wirzenius wrote this portably, Torvalds fucked it up :-) 9 * Wirzenius wrote this portably, Torvalds fucked it up :-)
10 */ 10 */
11 11
12/* 12/*
13 * Fri Jul 13 2001 Crutcher Dunnavant <crutcher+kernel@datastacks.com> 13 * Fri Jul 13 2001 Crutcher Dunnavant <crutcher+kernel@datastacks.com>
14 * - changed to provide snprintf and vsnprintf functions 14 * - changed to provide snprintf and vsnprintf functions
15 * So Feb 1 16:51:32 CET 2004 Juergen Quade <quade@hsnr.de> 15 * So Feb 1 16:51:32 CET 2004 Juergen Quade <quade@hsnr.de>
@@ -47,14 +47,14 @@ static unsigned int simple_guess_base(const char *cp)
47} 47}
48 48
49/** 49/**
50 * simple_strtoul - convert a string to an unsigned long 50 * simple_strtoull - convert a string to an unsigned long long
51 * @cp: The start of the string 51 * @cp: The start of the string
52 * @endp: A pointer to the end of the parsed string will be placed here 52 * @endp: A pointer to the end of the parsed string will be placed here
53 * @base: The number base to use 53 * @base: The number base to use
54 */ 54 */
55unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base) 55unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base)
56{ 56{
57 unsigned long result = 0; 57 unsigned long long result = 0;
58 58
59 if (!base) 59 if (!base)
60 base = simple_guess_base(cp); 60 base = simple_guess_base(cp);
@@ -71,58 +71,39 @@ unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
71 result = result * base + value; 71 result = result * base + value;
72 cp++; 72 cp++;
73 } 73 }
74
75 if (endp) 74 if (endp)
76 *endp = (char *)cp; 75 *endp = (char *)cp;
76
77 return result; 77 return result;
78} 78}
79EXPORT_SYMBOL(simple_strtoul); 79EXPORT_SYMBOL(simple_strtoull);
80 80
81/** 81/**
82 * simple_strtol - convert a string to a signed long 82 * simple_strtoul - convert a string to an unsigned long
83 * @cp: The start of the string 83 * @cp: The start of the string
84 * @endp: A pointer to the end of the parsed string will be placed here 84 * @endp: A pointer to the end of the parsed string will be placed here
85 * @base: The number base to use 85 * @base: The number base to use
86 */ 86 */
87long simple_strtol(const char *cp, char **endp, unsigned int base) 87unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base)
88{ 88{
89 if(*cp == '-') 89 return simple_strtoull(cp, endp, base);
90 return -simple_strtoul(cp + 1, endp, base);
91 return simple_strtoul(cp, endp, base);
92} 90}
93EXPORT_SYMBOL(simple_strtol); 91EXPORT_SYMBOL(simple_strtoul);
94 92
95/** 93/**
96 * simple_strtoull - convert a string to an unsigned long long 94 * simple_strtol - convert a string to a signed long
97 * @cp: The start of the string 95 * @cp: The start of the string
98 * @endp: A pointer to the end of the parsed string will be placed here 96 * @endp: A pointer to the end of the parsed string will be placed here
99 * @base: The number base to use 97 * @base: The number base to use
100 */ 98 */
101unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base) 99long simple_strtol(const char *cp, char **endp, unsigned int base)
102{ 100{
103 unsigned long long result = 0; 101 if (*cp == '-')
104 102 return -simple_strtoul(cp + 1, endp, base);
105 if (!base)
106 base = simple_guess_base(cp);
107
108 if (base == 16 && cp[0] == '0' && TOLOWER(cp[1]) == 'x')
109 cp += 2;
110
111 while (isxdigit(*cp)) {
112 unsigned int value;
113
114 value = isdigit(*cp) ? *cp - '0' : TOLOWER(*cp) - 'a' + 10;
115 if (value >= base)
116 break;
117 result = result * base + value;
118 cp++;
119 }
120 103
121 if (endp) 104 return simple_strtoul(cp, endp, base);
122 *endp = (char *)cp;
123 return result;
124} 105}
125EXPORT_SYMBOL(simple_strtoull); 106EXPORT_SYMBOL(simple_strtol);
126 107
127/** 108/**
128 * simple_strtoll - convert a string to a signed long long 109 * simple_strtoll - convert a string to a signed long long
@@ -132,8 +113,9 @@ EXPORT_SYMBOL(simple_strtoull);
132 */ 113 */
133long long simple_strtoll(const char *cp, char **endp, unsigned int base) 114long long simple_strtoll(const char *cp, char **endp, unsigned int base)
134{ 115{
135 if(*cp=='-') 116 if (*cp == '-')
136 return -simple_strtoull(cp + 1, endp, base); 117 return -simple_strtoull(cp + 1, endp, base);
118
137 return simple_strtoull(cp, endp, base); 119 return simple_strtoull(cp, endp, base);
138} 120}
139 121
@@ -173,6 +155,7 @@ int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
173 val = simple_strtoul(cp, &tail, base); 155 val = simple_strtoul(cp, &tail, base);
174 if (tail == cp) 156 if (tail == cp)
175 return -EINVAL; 157 return -EINVAL;
158
176 if ((*tail == '\0') || 159 if ((*tail == '\0') ||
177 ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) { 160 ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
178 *res = val; 161 *res = val;
@@ -285,10 +268,11 @@ EXPORT_SYMBOL(strict_strtoll);
285 268
286static int skip_atoi(const char **s) 269static int skip_atoi(const char **s)
287{ 270{
288 int i=0; 271 int i = 0;
289 272
290 while (isdigit(**s)) 273 while (isdigit(**s))
291 i = i*10 + *((*s)++) - '0'; 274 i = i*10 + *((*s)++) - '0';
275
292 return i; 276 return i;
293} 277}
294 278
@@ -302,7 +286,7 @@ static int skip_atoi(const char **s)
302/* Formats correctly any integer in [0,99999]. 286/* Formats correctly any integer in [0,99999].
303 * Outputs from one to five digits depending on input. 287 * Outputs from one to five digits depending on input.
304 * On i386 gcc 4.1.2 -O2: ~250 bytes of code. */ 288 * On i386 gcc 4.1.2 -O2: ~250 bytes of code. */
305static char* put_dec_trunc(char *buf, unsigned q) 289static char *put_dec_trunc(char *buf, unsigned q)
306{ 290{
307 unsigned d3, d2, d1, d0; 291 unsigned d3, d2, d1, d0;
308 d1 = (q>>4) & 0xf; 292 d1 = (q>>4) & 0xf;
@@ -331,14 +315,15 @@ static char* put_dec_trunc(char *buf, unsigned q)
331 d3 = d3 - 10*q; 315 d3 = d3 - 10*q;
332 *buf++ = d3 + '0'; /* next digit */ 316 *buf++ = d3 + '0'; /* next digit */
333 if (q != 0) 317 if (q != 0)
334 *buf++ = q + '0'; /* most sign. digit */ 318 *buf++ = q + '0'; /* most sign. digit */
335 } 319 }
336 } 320 }
337 } 321 }
322
338 return buf; 323 return buf;
339} 324}
340/* Same with if's removed. Always emits five digits */ 325/* Same with if's removed. Always emits five digits */
341static char* put_dec_full(char *buf, unsigned q) 326static char *put_dec_full(char *buf, unsigned q)
342{ 327{
343 /* BTW, if q is in [0,9999], 8-bit ints will be enough, */ 328 /* BTW, if q is in [0,9999], 8-bit ints will be enough, */
344 /* but anyway, gcc produces better code with full-sized ints */ 329 /* but anyway, gcc produces better code with full-sized ints */
@@ -347,14 +332,15 @@ static char* put_dec_full(char *buf, unsigned q)
347 d2 = (q>>8) & 0xf; 332 d2 = (q>>8) & 0xf;
348 d3 = (q>>12); 333 d3 = (q>>12);
349 334
350 /* Possible ways to approx. divide by 10 */ 335 /*
351 /* gcc -O2 replaces multiply with shifts and adds */ 336 * Possible ways to approx. divide by 10
352 // (x * 0xcd) >> 11: 11001101 - shorter code than * 0x67 (on i386) 337 * gcc -O2 replaces multiply with shifts and adds
353 // (x * 0x67) >> 10: 1100111 338 * (x * 0xcd) >> 11: 11001101 - shorter code than * 0x67 (on i386)
354 // (x * 0x34) >> 9: 110100 - same 339 * (x * 0x67) >> 10: 1100111
355 // (x * 0x1a) >> 8: 11010 - same 340 * (x * 0x34) >> 9: 110100 - same
356 // (x * 0x0d) >> 7: 1101 - same, shortest code (on i386) 341 * (x * 0x1a) >> 8: 11010 - same
357 342 * (x * 0x0d) >> 7: 1101 - same, shortest code (on i386)
343 */
358 d0 = 6*(d3 + d2 + d1) + (q & 0xf); 344 d0 = 6*(d3 + d2 + d1) + (q & 0xf);
359 q = (d0 * 0xcd) >> 11; 345 q = (d0 * 0xcd) >> 11;
360 d0 = d0 - 10*q; 346 d0 = d0 - 10*q;
@@ -375,10 +361,11 @@ static char* put_dec_full(char *buf, unsigned q)
375 d3 = d3 - 10*q; 361 d3 = d3 - 10*q;
376 *buf++ = d3 + '0'; 362 *buf++ = d3 + '0';
377 *buf++ = q + '0'; 363 *buf++ = q + '0';
364
378 return buf; 365 return buf;
379} 366}
380/* No inlining helps gcc to use registers better */ 367/* No inlining helps gcc to use registers better */
381static noinline char* put_dec(char *buf, unsigned long long num) 368static noinline char *put_dec(char *buf, unsigned long long num)
382{ 369{
383 while (1) { 370 while (1) {
384 unsigned rem; 371 unsigned rem;
@@ -394,8 +381,8 @@ static noinline char* put_dec(char *buf, unsigned long long num)
394#define PLUS 4 /* show plus */ 381#define PLUS 4 /* show plus */
395#define SPACE 8 /* space if plus */ 382#define SPACE 8 /* space if plus */
396#define LEFT 16 /* left justified */ 383#define LEFT 16 /* left justified */
397#define SMALL 32 /* Must be 32 == 0x20 */ 384#define SMALL 32 /* use lowercase in hex (must be 32 == 0x20) */
398#define SPECIAL 64 /* 0x */ 385#define SPECIAL 64 /* prefix hex with "0x", octal with "0" */
399 386
400enum format_type { 387enum format_type {
401 FORMAT_TYPE_NONE, /* Just a string part */ 388 FORMAT_TYPE_NONE, /* Just a string part */
@@ -421,12 +408,12 @@ enum format_type {
421}; 408};
422 409
423struct printf_spec { 410struct printf_spec {
424 enum format_type type; 411 u16 type;
425 int flags; /* flags to number() */ 412 s16 field_width; /* width of output field */
426 int field_width; /* width of output field */ 413 u8 flags; /* flags to number() */
427 int base; 414 u8 base;
428 int precision; /* # of digits/chars */ 415 s8 precision; /* # of digits/chars */
429 int qualifier; 416 u8 qualifier;
430}; 417};
431 418
432static char *number(char *buf, char *end, unsigned long long num, 419static char *number(char *buf, char *end, unsigned long long num,
@@ -448,9 +435,9 @@ static char *number(char *buf, char *end, unsigned long long num,
448 spec.flags &= ~ZEROPAD; 435 spec.flags &= ~ZEROPAD;
449 sign = 0; 436 sign = 0;
450 if (spec.flags & SIGN) { 437 if (spec.flags & SIGN) {
451 if ((signed long long) num < 0) { 438 if ((signed long long)num < 0) {
452 sign = '-'; 439 sign = '-';
453 num = - (signed long long) num; 440 num = -(signed long long)num;
454 spec.field_width--; 441 spec.field_width--;
455 } else if (spec.flags & PLUS) { 442 } else if (spec.flags & PLUS) {
456 sign = '+'; 443 sign = '+';
@@ -478,7 +465,9 @@ static char *number(char *buf, char *end, unsigned long long num,
478 else if (spec.base != 10) { /* 8 or 16 */ 465 else if (spec.base != 10) { /* 8 or 16 */
479 int mask = spec.base - 1; 466 int mask = spec.base - 1;
480 int shift = 3; 467 int shift = 3;
481 if (spec.base == 16) shift = 4; 468
469 if (spec.base == 16)
470 shift = 4;
482 do { 471 do {
483 tmp[i++] = (digits[((unsigned char)num) & mask] | locase); 472 tmp[i++] = (digits[((unsigned char)num) & mask] | locase);
484 num >>= shift; 473 num >>= shift;
@@ -493,7 +482,7 @@ static char *number(char *buf, char *end, unsigned long long num,
493 /* leading space padding */ 482 /* leading space padding */
494 spec.field_width -= spec.precision; 483 spec.field_width -= spec.precision;
495 if (!(spec.flags & (ZEROPAD+LEFT))) { 484 if (!(spec.flags & (ZEROPAD+LEFT))) {
496 while(--spec.field_width >= 0) { 485 while (--spec.field_width >= 0) {
497 if (buf < end) 486 if (buf < end)
498 *buf = ' '; 487 *buf = ' ';
499 ++buf; 488 ++buf;
@@ -543,15 +532,16 @@ static char *number(char *buf, char *end, unsigned long long num,
543 *buf = ' '; 532 *buf = ' ';
544 ++buf; 533 ++buf;
545 } 534 }
535
546 return buf; 536 return buf;
547} 537}
548 538
549static char *string(char *buf, char *end, char *s, struct printf_spec spec) 539static char *string(char *buf, char *end, const char *s, struct printf_spec spec)
550{ 540{
551 int len, i; 541 int len, i;
552 542
553 if ((unsigned long)s < PAGE_SIZE) 543 if ((unsigned long)s < PAGE_SIZE)
554 s = "<NULL>"; 544 s = "(null)";
555 545
556 len = strnlen(s, spec.precision); 546 len = strnlen(s, spec.precision);
557 547
@@ -572,6 +562,7 @@ static char *string(char *buf, char *end, char *s, struct printf_spec spec)
572 *buf = ' '; 562 *buf = ' ';
573 ++buf; 563 ++buf;
574 } 564 }
565
575 return buf; 566 return buf;
576} 567}
577 568
@@ -585,47 +576,115 @@ static char *symbol_string(char *buf, char *end, void *ptr,
585 sprint_symbol(sym, value); 576 sprint_symbol(sym, value);
586 else 577 else
587 kallsyms_lookup(value, NULL, NULL, NULL, sym); 578 kallsyms_lookup(value, NULL, NULL, NULL, sym);
579
588 return string(buf, end, sym, spec); 580 return string(buf, end, sym, spec);
589#else 581#else
590 spec.field_width = 2*sizeof(void *); 582 spec.field_width = 2 * sizeof(void *);
591 spec.flags |= SPECIAL | SMALL | ZEROPAD; 583 spec.flags |= SPECIAL | SMALL | ZEROPAD;
592 spec.base = 16; 584 spec.base = 16;
585
593 return number(buf, end, value, spec); 586 return number(buf, end, value, spec);
594#endif 587#endif
595} 588}
596 589
597static char *resource_string(char *buf, char *end, struct resource *res, 590static char *resource_string(char *buf, char *end, struct resource *res,
598 struct printf_spec spec) 591 struct printf_spec spec, const char *fmt)
599{ 592{
600#ifndef IO_RSRC_PRINTK_SIZE 593#ifndef IO_RSRC_PRINTK_SIZE
601#define IO_RSRC_PRINTK_SIZE 4 594#define IO_RSRC_PRINTK_SIZE 6
602#endif 595#endif
603 596
604#ifndef MEM_RSRC_PRINTK_SIZE 597#ifndef MEM_RSRC_PRINTK_SIZE
605#define MEM_RSRC_PRINTK_SIZE 8 598#define MEM_RSRC_PRINTK_SIZE 10
606#endif 599#endif
607 struct printf_spec num_spec = { 600 static const struct printf_spec io_spec = {
608 .base = 16, 601 .base = 16,
602 .field_width = IO_RSRC_PRINTK_SIZE,
609 .precision = -1, 603 .precision = -1,
610 .flags = SPECIAL | SMALL | ZEROPAD, 604 .flags = SPECIAL | SMALL | ZEROPAD,
611 }; 605 };
612 /* room for the actual numbers, the two "0x", -, [, ] and the final zero */ 606 static const struct printf_spec mem_spec = {
613 char sym[4*sizeof(resource_size_t) + 8]; 607 .base = 16,
614 char *p = sym, *pend = sym + sizeof(sym); 608 .field_width = MEM_RSRC_PRINTK_SIZE,
615 int size = -1; 609 .precision = -1,
610 .flags = SPECIAL | SMALL | ZEROPAD,
611 };
612 static const struct printf_spec bus_spec = {
613 .base = 16,
614 .field_width = 2,
615 .precision = -1,
616 .flags = SMALL | ZEROPAD,
617 };
618 static const struct printf_spec dec_spec = {
619 .base = 10,
620 .precision = -1,
621 .flags = 0,
622 };
623 static const struct printf_spec str_spec = {
624 .field_width = -1,
625 .precision = 10,
626 .flags = LEFT,
627 };
628 static const struct printf_spec flag_spec = {
629 .base = 16,
630 .precision = -1,
631 .flags = SPECIAL | SMALL,
632 };
616 633
617 if (res->flags & IORESOURCE_IO) 634 /* 32-bit res (sizeof==4): 10 chars in dec, 10 in hex ("0x" + 8)
618 size = IO_RSRC_PRINTK_SIZE; 635 * 64-bit res (sizeof==8): 20 chars in dec, 18 in hex ("0x" + 16) */
619 else if (res->flags & IORESOURCE_MEM) 636#define RSRC_BUF_SIZE ((2 * sizeof(resource_size_t)) + 4)
620 size = MEM_RSRC_PRINTK_SIZE; 637#define FLAG_BUF_SIZE (2 * sizeof(res->flags))
638#define DECODED_BUF_SIZE sizeof("[mem - 64bit pref window disabled]")
639#define RAW_BUF_SIZE sizeof("[mem - flags 0x]")
640 char sym[max(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE,
641 2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)];
642
643 char *p = sym, *pend = sym + sizeof(sym);
644 int decode = (fmt[0] == 'R') ? 1 : 0;
645 const struct printf_spec *specp;
621 646
622 *p++ = '['; 647 *p++ = '[';
623 num_spec.field_width = size; 648 if (res->flags & IORESOURCE_IO) {
624 p = number(p, pend, res->start, num_spec); 649 p = string(p, pend, "io ", str_spec);
625 *p++ = '-'; 650 specp = &io_spec;
626 p = number(p, pend, res->end, num_spec); 651 } else if (res->flags & IORESOURCE_MEM) {
652 p = string(p, pend, "mem ", str_spec);
653 specp = &mem_spec;
654 } else if (res->flags & IORESOURCE_IRQ) {
655 p = string(p, pend, "irq ", str_spec);
656 specp = &dec_spec;
657 } else if (res->flags & IORESOURCE_DMA) {
658 p = string(p, pend, "dma ", str_spec);
659 specp = &dec_spec;
660 } else if (res->flags & IORESOURCE_BUS) {
661 p = string(p, pend, "bus ", str_spec);
662 specp = &bus_spec;
663 } else {
664 p = string(p, pend, "??? ", str_spec);
665 specp = &mem_spec;
666 decode = 0;
667 }
668 p = number(p, pend, res->start, *specp);
669 if (res->start != res->end) {
670 *p++ = '-';
671 p = number(p, pend, res->end, *specp);
672 }
673 if (decode) {
674 if (res->flags & IORESOURCE_MEM_64)
675 p = string(p, pend, " 64bit", str_spec);
676 if (res->flags & IORESOURCE_PREFETCH)
677 p = string(p, pend, " pref", str_spec);
678 if (res->flags & IORESOURCE_WINDOW)
679 p = string(p, pend, " window", str_spec);
680 if (res->flags & IORESOURCE_DISABLED)
681 p = string(p, pend, " disabled", str_spec);
682 } else {
683 p = string(p, pend, " flags ", str_spec);
684 p = number(p, pend, res->flags, flag_spec);
685 }
627 *p++ = ']'; 686 *p++ = ']';
628 *p = 0; 687 *p = '\0';
629 688
630 return string(buf, end, sym, spec); 689 return string(buf, end, sym, spec);
631} 690}
@@ -636,24 +695,55 @@ static char *mac_address_string(char *buf, char *end, u8 *addr,
636 char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")]; 695 char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")];
637 char *p = mac_addr; 696 char *p = mac_addr;
638 int i; 697 int i;
698 char separator;
699
700 if (fmt[1] == 'F') { /* FDDI canonical format */
701 separator = '-';
702 } else {
703 separator = ':';
704 }
639 705
640 for (i = 0; i < 6; i++) { 706 for (i = 0; i < 6; i++) {
641 p = pack_hex_byte(p, addr[i]); 707 p = pack_hex_byte(p, addr[i]);
642 if (fmt[0] == 'M' && i != 5) 708 if (fmt[0] == 'M' && i != 5)
643 *p++ = ':'; 709 *p++ = separator;
644 } 710 }
645 *p = '\0'; 711 *p = '\0';
646 712
647 return string(buf, end, mac_addr, spec); 713 return string(buf, end, mac_addr, spec);
648} 714}
649 715
650static char *ip4_string(char *p, const u8 *addr, bool leading_zeros) 716static char *ip4_string(char *p, const u8 *addr, const char *fmt)
651{ 717{
652 int i; 718 int i;
653 719 bool leading_zeros = (fmt[0] == 'i');
720 int index;
721 int step;
722
723 switch (fmt[2]) {
724 case 'h':
725#ifdef __BIG_ENDIAN
726 index = 0;
727 step = 1;
728#else
729 index = 3;
730 step = -1;
731#endif
732 break;
733 case 'l':
734 index = 3;
735 step = -1;
736 break;
737 case 'n':
738 case 'b':
739 default:
740 index = 0;
741 step = 1;
742 break;
743 }
654 for (i = 0; i < 4; i++) { 744 for (i = 0; i < 4; i++) {
655 char temp[3]; /* hold each IP quad in reverse order */ 745 char temp[3]; /* hold each IP quad in reverse order */
656 int digits = put_dec_trunc(temp, addr[i]) - temp; 746 int digits = put_dec_trunc(temp, addr[index]) - temp;
657 if (leading_zeros) { 747 if (leading_zeros) {
658 if (digits < 3) 748 if (digits < 3)
659 *p++ = '0'; 749 *p++ = '0';
@@ -665,23 +755,21 @@ static char *ip4_string(char *p, const u8 *addr, bool leading_zeros)
665 *p++ = temp[digits]; 755 *p++ = temp[digits];
666 if (i < 3) 756 if (i < 3)
667 *p++ = '.'; 757 *p++ = '.';
758 index += step;
668 } 759 }
669
670 *p = '\0'; 760 *p = '\0';
761
671 return p; 762 return p;
672} 763}
673 764
674static char *ip6_compressed_string(char *p, const char *addr) 765static char *ip6_compressed_string(char *p, const char *addr)
675{ 766{
676 int i; 767 int i, j, range;
677 int j;
678 int range;
679 unsigned char zerolength[8]; 768 unsigned char zerolength[8];
680 int longest = 1; 769 int longest = 1;
681 int colonpos = -1; 770 int colonpos = -1;
682 u16 word; 771 u16 word;
683 u8 hi; 772 u8 hi, lo;
684 u8 lo;
685 bool needcolon = false; 773 bool needcolon = false;
686 bool useIPv4; 774 bool useIPv4;
687 struct in6_addr in6; 775 struct in6_addr in6;
@@ -735,8 +823,9 @@ static char *ip6_compressed_string(char *p, const char *addr)
735 p = pack_hex_byte(p, hi); 823 p = pack_hex_byte(p, hi);
736 else 824 else
737 *p++ = hex_asc_lo(hi); 825 *p++ = hex_asc_lo(hi);
826 p = pack_hex_byte(p, lo);
738 } 827 }
739 if (hi || lo > 0x0f) 828 else if (lo > 0x0f)
740 p = pack_hex_byte(p, lo); 829 p = pack_hex_byte(p, lo);
741 else 830 else
742 *p++ = hex_asc_lo(lo); 831 *p++ = hex_asc_lo(lo);
@@ -746,24 +835,25 @@ static char *ip6_compressed_string(char *p, const char *addr)
746 if (useIPv4) { 835 if (useIPv4) {
747 if (needcolon) 836 if (needcolon)
748 *p++ = ':'; 837 *p++ = ':';
749 p = ip4_string(p, &in6.s6_addr[12], false); 838 p = ip4_string(p, &in6.s6_addr[12], "I4");
750 } 839 }
751
752 *p = '\0'; 840 *p = '\0';
841
753 return p; 842 return p;
754} 843}
755 844
756static char *ip6_string(char *p, const char *addr, const char *fmt) 845static char *ip6_string(char *p, const char *addr, const char *fmt)
757{ 846{
758 int i; 847 int i;
848
759 for (i = 0; i < 8; i++) { 849 for (i = 0; i < 8; i++) {
760 p = pack_hex_byte(p, *addr++); 850 p = pack_hex_byte(p, *addr++);
761 p = pack_hex_byte(p, *addr++); 851 p = pack_hex_byte(p, *addr++);
762 if (fmt[0] == 'I' && i != 7) 852 if (fmt[0] == 'I' && i != 7)
763 *p++ = ':'; 853 *p++ = ':';
764 } 854 }
765
766 *p = '\0'; 855 *p = '\0';
856
767 return p; 857 return p;
768} 858}
769 859
@@ -785,11 +875,57 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
785{ 875{
786 char ip4_addr[sizeof("255.255.255.255")]; 876 char ip4_addr[sizeof("255.255.255.255")];
787 877
788 ip4_string(ip4_addr, addr, fmt[0] == 'i'); 878 ip4_string(ip4_addr, addr, fmt);
789 879
790 return string(buf, end, ip4_addr, spec); 880 return string(buf, end, ip4_addr, spec);
791} 881}
792 882
883static char *uuid_string(char *buf, char *end, const u8 *addr,
884 struct printf_spec spec, const char *fmt)
885{
886 char uuid[sizeof("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
887 char *p = uuid;
888 int i;
889 static const u8 be[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
890 static const u8 le[16] = {3,2,1,0,5,4,7,6,8,9,10,11,12,13,14,15};
891 const u8 *index = be;
892 bool uc = false;
893
894 switch (*(++fmt)) {
895 case 'L':
896 uc = true; /* fall-through */
897 case 'l':
898 index = le;
899 break;
900 case 'B':
901 uc = true;
902 break;
903 }
904
905 for (i = 0; i < 16; i++) {
906 p = pack_hex_byte(p, addr[index[i]]);
907 switch (i) {
908 case 3:
909 case 5:
910 case 7:
911 case 9:
912 *p++ = '-';
913 break;
914 }
915 }
916
917 *p = 0;
918
919 if (uc) {
920 p = uuid;
921 do {
922 *p = toupper(*p);
923 } while (*(++p));
924 }
925
926 return string(buf, end, uuid, spec);
927}
928
793/* 929/*
794 * Show a '%p' thing. A kernel extension is that the '%p' is followed 930 * Show a '%p' thing. A kernel extension is that the '%p' is followed
795 * by an extra set of alphanumeric characters that are extended format 931 * by an extra set of alphanumeric characters that are extended format
@@ -801,19 +937,34 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
801 * - 'f' For simple symbolic function names without offset 937 * - 'f' For simple symbolic function names without offset
802 * - 'S' For symbolic direct pointers with offset 938 * - 'S' For symbolic direct pointers with offset
803 * - 's' For symbolic direct pointers without offset 939 * - 's' For symbolic direct pointers without offset
804 * - 'R' For a struct resource pointer, it prints the range of 940 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
805 * addresses (not the name nor the flags) 941 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
806 * - 'M' For a 6-byte MAC address, it prints the address in the 942 * - 'M' For a 6-byte MAC address, it prints the address in the
807 * usual colon-separated hex notation 943 * usual colon-separated hex notation
808 * - 'm' For a 6-byte MAC address, it prints the hex address without colons 944 * - 'm' For a 6-byte MAC address, it prints the hex address without colons
945 * - 'MF' For a 6-byte MAC FDDI address, it prints the address
946 * with a dash-separated hex notation
809 * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way 947 * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way
810 * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4) 948 * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)
811 * IPv6 uses colon separated network-order 16 bit hex with leading 0's 949 * IPv6 uses colon separated network-order 16 bit hex with leading 0's
812 * - 'i' [46] for 'raw' IPv4/IPv6 addresses 950 * - 'i' [46] for 'raw' IPv4/IPv6 addresses
813 * IPv6 omits the colons (01020304...0f) 951 * IPv6 omits the colons (01020304...0f)
814 * IPv4 uses dot-separated decimal with leading 0's (010.123.045.006) 952 * IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
953 * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order
815 * - 'I6c' for IPv6 addresses printed as specified by 954 * - 'I6c' for IPv6 addresses printed as specified by
816 * http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt 955 * http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
956 * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
957 * "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
958 * Options for %pU are:
959 * b big endian lower case hex (default)
960 * B big endian UPPER case hex
961 * l little endian lower case hex
962 * L little endian UPPER case hex
963 * big endian output byte order is:
964 * [0][1][2][3]-[4][5]-[6][7]-[8][9]-[10][11][12][13][14][15]
965 * little endian output byte order is:
966 * [3][2][1][0]-[5][4]-[7][6]-[8][9]-[10][11][12][13][14][15]
967 *
817 * Note: The difference between 'S' and 'F' is that on ia64 and ppc64 968 * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
818 * function pointers are really function descriptors, which contain a 969 * function pointers are really function descriptors, which contain a
819 * pointer to the real address. 970 * pointer to the real address.
@@ -828,14 +979,16 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
828 case 'F': 979 case 'F':
829 case 'f': 980 case 'f':
830 ptr = dereference_function_descriptor(ptr); 981 ptr = dereference_function_descriptor(ptr);
831 case 's':
832 /* Fallthrough */ 982 /* Fallthrough */
833 case 'S': 983 case 'S':
984 case 's':
834 return symbol_string(buf, end, ptr, spec, *fmt); 985 return symbol_string(buf, end, ptr, spec, *fmt);
835 case 'R': 986 case 'R':
836 return resource_string(buf, end, ptr, spec); 987 case 'r':
988 return resource_string(buf, end, ptr, spec, fmt);
837 case 'M': /* Colon separated: 00:01:02:03:04:05 */ 989 case 'M': /* Colon separated: 00:01:02:03:04:05 */
838 case 'm': /* Contiguous: 000102030405 */ 990 case 'm': /* Contiguous: 000102030405 */
991 /* [mM]F (FDDI, bit reversed) */
839 return mac_address_string(buf, end, ptr, spec, fmt); 992 return mac_address_string(buf, end, ptr, spec, fmt);
840 case 'I': /* Formatted IP supported 993 case 'I': /* Formatted IP supported
841 * 4: 1.2.3.4 994 * 4: 1.2.3.4
@@ -853,6 +1006,8 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
853 return ip4_addr_string(buf, end, ptr, spec, fmt); 1006 return ip4_addr_string(buf, end, ptr, spec, fmt);
854 } 1007 }
855 break; 1008 break;
1009 case 'U':
1010 return uuid_string(buf, end, ptr, spec, fmt);
856 } 1011 }
857 spec.flags |= SMALL; 1012 spec.flags |= SMALL;
858 if (spec.field_width == -1) { 1013 if (spec.field_width == -1) {
@@ -970,8 +1125,8 @@ precision:
970qualifier: 1125qualifier:
971 /* get the conversion qualifier */ 1126 /* get the conversion qualifier */
972 spec->qualifier = -1; 1127 spec->qualifier = -1;
973 if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || 1128 if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
974 *fmt == 'Z' || *fmt == 'z' || *fmt == 't') { 1129 TOLOWER(*fmt) == 'z' || *fmt == 't') {
975 spec->qualifier = *fmt++; 1130 spec->qualifier = *fmt++;
976 if (unlikely(spec->qualifier == *fmt)) { 1131 if (unlikely(spec->qualifier == *fmt)) {
977 if (spec->qualifier == 'l') { 1132 if (spec->qualifier == 'l') {
@@ -1038,7 +1193,7 @@ qualifier:
1038 spec->type = FORMAT_TYPE_LONG; 1193 spec->type = FORMAT_TYPE_LONG;
1039 else 1194 else
1040 spec->type = FORMAT_TYPE_ULONG; 1195 spec->type = FORMAT_TYPE_ULONG;
1041 } else if (spec->qualifier == 'Z' || spec->qualifier == 'z') { 1196 } else if (TOLOWER(spec->qualifier) == 'z') {
1042 spec->type = FORMAT_TYPE_SIZE_T; 1197 spec->type = FORMAT_TYPE_SIZE_T;
1043 } else if (spec->qualifier == 't') { 1198 } else if (spec->qualifier == 't') {
1044 spec->type = FORMAT_TYPE_PTRDIFF; 1199 spec->type = FORMAT_TYPE_PTRDIFF;
@@ -1074,7 +1229,18 @@ qualifier:
1074 * %ps output the name of a text symbol without offset 1229 * %ps output the name of a text symbol without offset
1075 * %pF output the name of a function pointer with its offset 1230 * %pF output the name of a function pointer with its offset
1076 * %pf output the name of a function pointer without its offset 1231 * %pf output the name of a function pointer without its offset
1077 * %pR output the address range in a struct resource 1232 * %pR output the address range in a struct resource with decoded flags
1233 * %pr output the address range in a struct resource with raw flags
1234 * %pM output a 6-byte MAC address with colons
1235 * %pm output a 6-byte MAC address without colons
1236 * %pI4 print an IPv4 address without leading zeros
1237 * %pi4 print an IPv4 address with leading zeros
1238 * %pI6 print an IPv6 address with colons
1239 * %pi6 print an IPv6 address without colons
1240 * %pI6c print an IPv6 address as specified by
1241 * http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
1242 * %pU[bBlL] print a UUID/GUID in big or little endian using lower or upper
1243 * case.
1078 * %n is ignored 1244 * %n is ignored
1079 * 1245 *
1080 * The return value is the number of characters which would 1246 * The return value is the number of characters which would
@@ -1091,8 +1257,7 @@ qualifier:
1091int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) 1257int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
1092{ 1258{
1093 unsigned long long num; 1259 unsigned long long num;
1094 char *str, *end, c; 1260 char *str, *end;
1095 int read;
1096 struct printf_spec spec = {0}; 1261 struct printf_spec spec = {0};
1097 1262
1098 /* Reject out-of-range values early. Large positive sizes are 1263 /* Reject out-of-range values early. Large positive sizes are
@@ -1111,8 +1276,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
1111 1276
1112 while (*fmt) { 1277 while (*fmt) {
1113 const char *old_fmt = fmt; 1278 const char *old_fmt = fmt;
1114 1279 int read = format_decode(fmt, &spec);
1115 read = format_decode(fmt, &spec);
1116 1280
1117 fmt += read; 1281 fmt += read;
1118 1282
@@ -1136,7 +1300,9 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
1136 spec.precision = va_arg(args, int); 1300 spec.precision = va_arg(args, int);
1137 break; 1301 break;
1138 1302
1139 case FORMAT_TYPE_CHAR: 1303 case FORMAT_TYPE_CHAR: {
1304 char c;
1305
1140 if (!(spec.flags & LEFT)) { 1306 if (!(spec.flags & LEFT)) {
1141 while (--spec.field_width > 0) { 1307 while (--spec.field_width > 0) {
1142 if (str < end) 1308 if (str < end)
@@ -1155,6 +1321,7 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
1155 ++str; 1321 ++str;
1156 } 1322 }
1157 break; 1323 break;
1324 }
1158 1325
1159 case FORMAT_TYPE_STR: 1326 case FORMAT_TYPE_STR:
1160 str = string(str, end, va_arg(args, char *), spec); 1327 str = string(str, end, va_arg(args, char *), spec);
@@ -1180,13 +1347,12 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
1180 break; 1347 break;
1181 1348
1182 case FORMAT_TYPE_NRCHARS: { 1349 case FORMAT_TYPE_NRCHARS: {
1183 int qualifier = spec.qualifier; 1350 u8 qualifier = spec.qualifier;
1184 1351
1185 if (qualifier == 'l') { 1352 if (qualifier == 'l') {
1186 long *ip = va_arg(args, long *); 1353 long *ip = va_arg(args, long *);
1187 *ip = (str - buf); 1354 *ip = (str - buf);
1188 } else if (qualifier == 'Z' || 1355 } else if (TOLOWER(qualifier) == 'z') {
1189 qualifier == 'z') {
1190 size_t *ip = va_arg(args, size_t *); 1356 size_t *ip = va_arg(args, size_t *);
1191 *ip = (str - buf); 1357 *ip = (str - buf);
1192 } else { 1358 } else {
@@ -1269,7 +1435,8 @@ int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
1269{ 1435{
1270 int i; 1436 int i;
1271 1437
1272 i=vsnprintf(buf,size,fmt,args); 1438 i = vsnprintf(buf, size, fmt, args);
1439
1273 return (i >= size) ? (size - 1) : i; 1440 return (i >= size) ? (size - 1) : i;
1274} 1441}
1275EXPORT_SYMBOL(vscnprintf); 1442EXPORT_SYMBOL(vscnprintf);
@@ -1288,14 +1455,15 @@ EXPORT_SYMBOL(vscnprintf);
1288 * 1455 *
1289 * See the vsnprintf() documentation for format string extensions over C99. 1456 * See the vsnprintf() documentation for format string extensions over C99.
1290 */ 1457 */
1291int snprintf(char * buf, size_t size, const char *fmt, ...) 1458int snprintf(char *buf, size_t size, const char *fmt, ...)
1292{ 1459{
1293 va_list args; 1460 va_list args;
1294 int i; 1461 int i;
1295 1462
1296 va_start(args, fmt); 1463 va_start(args, fmt);
1297 i=vsnprintf(buf,size,fmt,args); 1464 i = vsnprintf(buf, size, fmt, args);
1298 va_end(args); 1465 va_end(args);
1466
1299 return i; 1467 return i;
1300} 1468}
1301EXPORT_SYMBOL(snprintf); 1469EXPORT_SYMBOL(snprintf);
@@ -1311,7 +1479,7 @@ EXPORT_SYMBOL(snprintf);
1311 * the trailing '\0'. If @size is <= 0 the function returns 0. 1479 * the trailing '\0'. If @size is <= 0 the function returns 0.
1312 */ 1480 */
1313 1481
1314int scnprintf(char * buf, size_t size, const char *fmt, ...) 1482int scnprintf(char *buf, size_t size, const char *fmt, ...)
1315{ 1483{
1316 va_list args; 1484 va_list args;
1317 int i; 1485 int i;
@@ -1319,6 +1487,7 @@ int scnprintf(char * buf, size_t size, const char *fmt, ...)
1319 va_start(args, fmt); 1487 va_start(args, fmt);
1320 i = vsnprintf(buf, size, fmt, args); 1488 i = vsnprintf(buf, size, fmt, args);
1321 va_end(args); 1489 va_end(args);
1490
1322 return (i >= size) ? (size - 1) : i; 1491 return (i >= size) ? (size - 1) : i;
1323} 1492}
1324EXPORT_SYMBOL(scnprintf); 1493EXPORT_SYMBOL(scnprintf);
@@ -1356,14 +1525,15 @@ EXPORT_SYMBOL(vsprintf);
1356 * 1525 *
1357 * See the vsnprintf() documentation for format string extensions over C99. 1526 * See the vsnprintf() documentation for format string extensions over C99.
1358 */ 1527 */
1359int sprintf(char * buf, const char *fmt, ...) 1528int sprintf(char *buf, const char *fmt, ...)
1360{ 1529{
1361 va_list args; 1530 va_list args;
1362 int i; 1531 int i;
1363 1532
1364 va_start(args, fmt); 1533 va_start(args, fmt);
1365 i=vsnprintf(buf, INT_MAX, fmt, args); 1534 i = vsnprintf(buf, INT_MAX, fmt, args);
1366 va_end(args); 1535 va_end(args);
1536
1367 return i; 1537 return i;
1368} 1538}
1369EXPORT_SYMBOL(sprintf); 1539EXPORT_SYMBOL(sprintf);
@@ -1396,7 +1566,6 @@ int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args)
1396{ 1566{
1397 struct printf_spec spec = {0}; 1567 struct printf_spec spec = {0};
1398 char *str, *end; 1568 char *str, *end;
1399 int read;
1400 1569
1401 str = (char *)bin_buf; 1570 str = (char *)bin_buf;
1402 end = (char *)(bin_buf + size); 1571 end = (char *)(bin_buf + size);
@@ -1421,14 +1590,15 @@ do { \
1421 str += sizeof(type); \ 1590 str += sizeof(type); \
1422} while (0) 1591} while (0)
1423 1592
1424
1425 while (*fmt) { 1593 while (*fmt) {
1426 read = format_decode(fmt, &spec); 1594 int read = format_decode(fmt, &spec);
1427 1595
1428 fmt += read; 1596 fmt += read;
1429 1597
1430 switch (spec.type) { 1598 switch (spec.type) {
1431 case FORMAT_TYPE_NONE: 1599 case FORMAT_TYPE_NONE:
1600 case FORMAT_TYPE_INVALID:
1601 case FORMAT_TYPE_PERCENT_CHAR:
1432 break; 1602 break;
1433 1603
1434 case FORMAT_TYPE_WIDTH: 1604 case FORMAT_TYPE_WIDTH:
@@ -1443,13 +1613,14 @@ do { \
1443 case FORMAT_TYPE_STR: { 1613 case FORMAT_TYPE_STR: {
1444 const char *save_str = va_arg(args, char *); 1614 const char *save_str = va_arg(args, char *);
1445 size_t len; 1615 size_t len;
1616
1446 if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE 1617 if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
1447 || (unsigned long)save_str < PAGE_SIZE) 1618 || (unsigned long)save_str < PAGE_SIZE)
1448 save_str = "<NULL>"; 1619 save_str = "(null)";
1449 len = strlen(save_str); 1620 len = strlen(save_str) + 1;
1450 if (str + len + 1 < end) 1621 if (str + len < end)
1451 memcpy(str, save_str, len + 1); 1622 memcpy(str, save_str, len);
1452 str += len + 1; 1623 str += len;
1453 break; 1624 break;
1454 } 1625 }
1455 1626
@@ -1460,19 +1631,13 @@ do { \
1460 fmt++; 1631 fmt++;
1461 break; 1632 break;
1462 1633
1463 case FORMAT_TYPE_PERCENT_CHAR:
1464 break;
1465
1466 case FORMAT_TYPE_INVALID:
1467 break;
1468
1469 case FORMAT_TYPE_NRCHARS: { 1634 case FORMAT_TYPE_NRCHARS: {
1470 /* skip %n 's argument */ 1635 /* skip %n 's argument */
1471 int qualifier = spec.qualifier; 1636 u8 qualifier = spec.qualifier;
1472 void *skip_arg; 1637 void *skip_arg;
1473 if (qualifier == 'l') 1638 if (qualifier == 'l')
1474 skip_arg = va_arg(args, long *); 1639 skip_arg = va_arg(args, long *);
1475 else if (qualifier == 'Z' || qualifier == 'z') 1640 else if (TOLOWER(qualifier) == 'z')
1476 skip_arg = va_arg(args, size_t *); 1641 skip_arg = va_arg(args, size_t *);
1477 else 1642 else
1478 skip_arg = va_arg(args, int *); 1643 skip_arg = va_arg(args, int *);
@@ -1508,8 +1673,8 @@ do { \
1508 } 1673 }
1509 } 1674 }
1510 } 1675 }
1511 return (u32 *)(PTR_ALIGN(str, sizeof(u32))) - bin_buf;
1512 1676
1677 return (u32 *)(PTR_ALIGN(str, sizeof(u32))) - bin_buf;
1513#undef save_arg 1678#undef save_arg
1514} 1679}
1515EXPORT_SYMBOL_GPL(vbin_printf); 1680EXPORT_SYMBOL_GPL(vbin_printf);
@@ -1538,11 +1703,9 @@ EXPORT_SYMBOL_GPL(vbin_printf);
1538 */ 1703 */
1539int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) 1704int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
1540{ 1705{
1541 unsigned long long num;
1542 char *str, *end, c;
1543 const char *args = (const char *)bin_buf;
1544
1545 struct printf_spec spec = {0}; 1706 struct printf_spec spec = {0};
1707 char *str, *end;
1708 const char *args = (const char *)bin_buf;
1546 1709
1547 if (WARN_ON_ONCE((int) size < 0)) 1710 if (WARN_ON_ONCE((int) size < 0))
1548 return 0; 1711 return 0;
@@ -1572,10 +1735,8 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
1572 } 1735 }
1573 1736
1574 while (*fmt) { 1737 while (*fmt) {
1575 int read;
1576 const char *old_fmt = fmt; 1738 const char *old_fmt = fmt;
1577 1739 int read = format_decode(fmt, &spec);
1578 read = format_decode(fmt, &spec);
1579 1740
1580 fmt += read; 1741 fmt += read;
1581 1742
@@ -1599,7 +1760,9 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
1599 spec.precision = get_arg(int); 1760 spec.precision = get_arg(int);
1600 break; 1761 break;
1601 1762
1602 case FORMAT_TYPE_CHAR: 1763 case FORMAT_TYPE_CHAR: {
1764 char c;
1765
1603 if (!(spec.flags & LEFT)) { 1766 if (!(spec.flags & LEFT)) {
1604 while (--spec.field_width > 0) { 1767 while (--spec.field_width > 0) {
1605 if (str < end) 1768 if (str < end)
@@ -1617,11 +1780,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
1617 ++str; 1780 ++str;
1618 } 1781 }
1619 break; 1782 break;
1783 }
1620 1784
1621 case FORMAT_TYPE_STR: { 1785 case FORMAT_TYPE_STR: {
1622 const char *str_arg = args; 1786 const char *str_arg = args;
1623 size_t len = strlen(str_arg); 1787 args += strlen(str_arg) + 1;
1624 args += len + 1;
1625 str = string(str, end, (char *)str_arg, spec); 1788 str = string(str, end, (char *)str_arg, spec);
1626 break; 1789 break;
1627 } 1790 }
@@ -1633,11 +1796,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
1633 break; 1796 break;
1634 1797
1635 case FORMAT_TYPE_PERCENT_CHAR: 1798 case FORMAT_TYPE_PERCENT_CHAR:
1636 if (str < end)
1637 *str = '%';
1638 ++str;
1639 break;
1640
1641 case FORMAT_TYPE_INVALID: 1799 case FORMAT_TYPE_INVALID:
1642 if (str < end) 1800 if (str < end)
1643 *str = '%'; 1801 *str = '%';
@@ -1648,15 +1806,15 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
1648 /* skip */ 1806 /* skip */
1649 break; 1807 break;
1650 1808
1651 default: 1809 default: {
1810 unsigned long long num;
1811
1652 switch (spec.type) { 1812 switch (spec.type) {
1653 1813
1654 case FORMAT_TYPE_LONG_LONG: 1814 case FORMAT_TYPE_LONG_LONG:
1655 num = get_arg(long long); 1815 num = get_arg(long long);
1656 break; 1816 break;
1657 case FORMAT_TYPE_ULONG: 1817 case FORMAT_TYPE_ULONG:
1658 num = get_arg(unsigned long);
1659 break;
1660 case FORMAT_TYPE_LONG: 1818 case FORMAT_TYPE_LONG:
1661 num = get_arg(unsigned long); 1819 num = get_arg(unsigned long);
1662 break; 1820 break;
@@ -1686,8 +1844,9 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
1686 } 1844 }
1687 1845
1688 str = number(str, end, num, spec); 1846 str = number(str, end, num, spec);
1689 } 1847 } /* default: */
1690 } 1848 } /* switch(spec.type) */
1849 } /* while(*fmt) */
1691 1850
1692 if (size > 0) { 1851 if (size > 0) {
1693 if (str < end) 1852 if (str < end)
@@ -1721,6 +1880,7 @@ int bprintf(u32 *bin_buf, size_t size, const char *fmt, ...)
1721 va_start(args, fmt); 1880 va_start(args, fmt);
1722 ret = vbin_printf(bin_buf, size, fmt, args); 1881 ret = vbin_printf(bin_buf, size, fmt, args);
1723 va_end(args); 1882 va_end(args);
1883
1724 return ret; 1884 return ret;
1725} 1885}
1726EXPORT_SYMBOL_GPL(bprintf); 1886EXPORT_SYMBOL_GPL(bprintf);
@@ -1733,27 +1893,25 @@ EXPORT_SYMBOL_GPL(bprintf);
1733 * @fmt: format of buffer 1893 * @fmt: format of buffer
1734 * @args: arguments 1894 * @args: arguments
1735 */ 1895 */
1736int vsscanf(const char * buf, const char * fmt, va_list args) 1896int vsscanf(const char *buf, const char *fmt, va_list args)
1737{ 1897{
1738 const char *str = buf; 1898 const char *str = buf;
1739 char *next; 1899 char *next;
1740 char digit; 1900 char digit;
1741 int num = 0; 1901 int num = 0;
1742 int qualifier; 1902 u8 qualifier;
1743 int base; 1903 u8 base;
1744 int field_width; 1904 s16 field_width;
1745 int is_sign = 0; 1905 bool is_sign;
1746 1906
1747 while(*fmt && *str) { 1907 while (*fmt && *str) {
1748 /* skip any white space in format */ 1908 /* skip any white space in format */
1749 /* white space in format matchs any amount of 1909 /* white space in format matchs any amount of
1750 * white space, including none, in the input. 1910 * white space, including none, in the input.
1751 */ 1911 */
1752 if (isspace(*fmt)) { 1912 if (isspace(*fmt)) {
1753 while (isspace(*fmt)) 1913 fmt = skip_spaces(++fmt);
1754 ++fmt; 1914 str = skip_spaces(str);
1755 while (isspace(*str))
1756 ++str;
1757 } 1915 }
1758 1916
1759 /* anything that is not a conversion must match exactly */ 1917 /* anything that is not a conversion must match exactly */
@@ -1766,7 +1924,7 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1766 if (!*fmt) 1924 if (!*fmt)
1767 break; 1925 break;
1768 ++fmt; 1926 ++fmt;
1769 1927
1770 /* skip this conversion. 1928 /* skip this conversion.
1771 * advance both strings to next white space 1929 * advance both strings to next white space
1772 */ 1930 */
@@ -1785,8 +1943,8 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1785 1943
1786 /* get conversion qualifier */ 1944 /* get conversion qualifier */
1787 qualifier = -1; 1945 qualifier = -1;
1788 if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || 1946 if (*fmt == 'h' || TOLOWER(*fmt) == 'l' ||
1789 *fmt == 'Z' || *fmt == 'z') { 1947 TOLOWER(*fmt) == 'z') {
1790 qualifier = *fmt++; 1948 qualifier = *fmt++;
1791 if (unlikely(qualifier == *fmt)) { 1949 if (unlikely(qualifier == *fmt)) {
1792 if (qualifier == 'h') { 1950 if (qualifier == 'h') {
@@ -1798,16 +1956,17 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1798 } 1956 }
1799 } 1957 }
1800 } 1958 }
1801 base = 10;
1802 is_sign = 0;
1803 1959
1804 if (!*fmt || !*str) 1960 if (!*fmt || !*str)
1805 break; 1961 break;
1806 1962
1807 switch(*fmt++) { 1963 base = 10;
1964 is_sign = 0;
1965
1966 switch (*fmt++) {
1808 case 'c': 1967 case 'c':
1809 { 1968 {
1810 char *s = (char *) va_arg(args,char*); 1969 char *s = (char *)va_arg(args, char*);
1811 if (field_width == -1) 1970 if (field_width == -1)
1812 field_width = 1; 1971 field_width = 1;
1813 do { 1972 do {
@@ -1818,17 +1977,15 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1818 continue; 1977 continue;
1819 case 's': 1978 case 's':
1820 { 1979 {
1821 char *s = (char *) va_arg(args, char *); 1980 char *s = (char *)va_arg(args, char *);
1822 if(field_width == -1) 1981 if (field_width == -1)
1823 field_width = INT_MAX; 1982 field_width = SHORT_MAX;
1824 /* first, skip leading white space in buffer */ 1983 /* first, skip leading white space in buffer */
1825 while (isspace(*str)) 1984 str = skip_spaces(str);
1826 str++;
1827 1985
1828 /* now copy until next white space */ 1986 /* now copy until next white space */
1829 while (*str && !isspace(*str) && field_width--) { 1987 while (*str && !isspace(*str) && field_width--)
1830 *s++ = *str++; 1988 *s++ = *str++;
1831 }
1832 *s = '\0'; 1989 *s = '\0';
1833 num++; 1990 num++;
1834 } 1991 }
@@ -1836,7 +1993,7 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1836 case 'n': 1993 case 'n':
1837 /* return number of characters read so far */ 1994 /* return number of characters read so far */
1838 { 1995 {
1839 int *i = (int *)va_arg(args,int*); 1996 int *i = (int *)va_arg(args, int*);
1840 *i = str - buf; 1997 *i = str - buf;
1841 } 1998 }
1842 continue; 1999 continue;
@@ -1848,14 +2005,14 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1848 base = 16; 2005 base = 16;
1849 break; 2006 break;
1850 case 'i': 2007 case 'i':
1851 base = 0; 2008 base = 0;
1852 case 'd': 2009 case 'd':
1853 is_sign = 1; 2010 is_sign = 1;
1854 case 'u': 2011 case 'u':
1855 break; 2012 break;
1856 case '%': 2013 case '%':
1857 /* looking for '%' in str */ 2014 /* looking for '%' in str */
1858 if (*str++ != '%') 2015 if (*str++ != '%')
1859 return num; 2016 return num;
1860 continue; 2017 continue;
1861 default: 2018 default:
@@ -1866,71 +2023,70 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
1866 /* have some sort of integer conversion. 2023 /* have some sort of integer conversion.
1867 * first, skip white space in buffer. 2024 * first, skip white space in buffer.
1868 */ 2025 */
1869 while (isspace(*str)) 2026 str = skip_spaces(str);
1870 str++;
1871 2027
1872 digit = *str; 2028 digit = *str;
1873 if (is_sign && digit == '-') 2029 if (is_sign && digit == '-')
1874 digit = *(str + 1); 2030 digit = *(str + 1);
1875 2031
1876 if (!digit 2032 if (!digit
1877 || (base == 16 && !isxdigit(digit)) 2033 || (base == 16 && !isxdigit(digit))
1878 || (base == 10 && !isdigit(digit)) 2034 || (base == 10 && !isdigit(digit))
1879 || (base == 8 && (!isdigit(digit) || digit > '7')) 2035 || (base == 8 && (!isdigit(digit) || digit > '7'))
1880 || (base == 0 && !isdigit(digit))) 2036 || (base == 0 && !isdigit(digit)))
1881 break; 2037 break;
1882 2038
1883 switch(qualifier) { 2039 switch (qualifier) {
1884 case 'H': /* that's 'hh' in format */ 2040 case 'H': /* that's 'hh' in format */
1885 if (is_sign) { 2041 if (is_sign) {
1886 signed char *s = (signed char *) va_arg(args,signed char *); 2042 signed char *s = (signed char *)va_arg(args, signed char *);
1887 *s = (signed char) simple_strtol(str,&next,base); 2043 *s = (signed char)simple_strtol(str, &next, base);
1888 } else { 2044 } else {
1889 unsigned char *s = (unsigned char *) va_arg(args, unsigned char *); 2045 unsigned char *s = (unsigned char *)va_arg(args, unsigned char *);
1890 *s = (unsigned char) simple_strtoul(str, &next, base); 2046 *s = (unsigned char)simple_strtoul(str, &next, base);
1891 } 2047 }
1892 break; 2048 break;
1893 case 'h': 2049 case 'h':
1894 if (is_sign) { 2050 if (is_sign) {
1895 short *s = (short *) va_arg(args,short *); 2051 short *s = (short *)va_arg(args, short *);
1896 *s = (short) simple_strtol(str,&next,base); 2052 *s = (short)simple_strtol(str, &next, base);
1897 } else { 2053 } else {
1898 unsigned short *s = (unsigned short *) va_arg(args, unsigned short *); 2054 unsigned short *s = (unsigned short *)va_arg(args, unsigned short *);
1899 *s = (unsigned short) simple_strtoul(str, &next, base); 2055 *s = (unsigned short)simple_strtoul(str, &next, base);
1900 } 2056 }
1901 break; 2057 break;
1902 case 'l': 2058 case 'l':
1903 if (is_sign) { 2059 if (is_sign) {
1904 long *l = (long *) va_arg(args,long *); 2060 long *l = (long *)va_arg(args, long *);
1905 *l = simple_strtol(str,&next,base); 2061 *l = simple_strtol(str, &next, base);
1906 } else { 2062 } else {
1907 unsigned long *l = (unsigned long*) va_arg(args,unsigned long*); 2063 unsigned long *l = (unsigned long *)va_arg(args, unsigned long *);
1908 *l = simple_strtoul(str,&next,base); 2064 *l = simple_strtoul(str, &next, base);
1909 } 2065 }
1910 break; 2066 break;
1911 case 'L': 2067 case 'L':
1912 if (is_sign) { 2068 if (is_sign) {
1913 long long *l = (long long*) va_arg(args,long long *); 2069 long long *l = (long long *)va_arg(args, long long *);
1914 *l = simple_strtoll(str,&next,base); 2070 *l = simple_strtoll(str, &next, base);
1915 } else { 2071 } else {
1916 unsigned long long *l = (unsigned long long*) va_arg(args,unsigned long long*); 2072 unsigned long long *l = (unsigned long long *)va_arg(args, unsigned long long *);
1917 *l = simple_strtoull(str,&next,base); 2073 *l = simple_strtoull(str, &next, base);
1918 } 2074 }
1919 break; 2075 break;
1920 case 'Z': 2076 case 'Z':
1921 case 'z': 2077 case 'z':
1922 { 2078 {
1923 size_t *s = (size_t*) va_arg(args,size_t*); 2079 size_t *s = (size_t *)va_arg(args, size_t *);
1924 *s = (size_t) simple_strtoul(str,&next,base); 2080 *s = (size_t)simple_strtoul(str, &next, base);
1925 } 2081 }
1926 break; 2082 break;
1927 default: 2083 default:
1928 if (is_sign) { 2084 if (is_sign) {
1929 int *i = (int *) va_arg(args, int*); 2085 int *i = (int *)va_arg(args, int *);
1930 *i = (int) simple_strtol(str,&next,base); 2086 *i = (int)simple_strtol(str, &next, base);
1931 } else { 2087 } else {
1932 unsigned int *i = (unsigned int*) va_arg(args, unsigned int*); 2088 unsigned int *i = (unsigned int *)va_arg(args, unsigned int*);
1933 *i = (unsigned int) simple_strtoul(str,&next,base); 2089 *i = (unsigned int)simple_strtoul(str, &next, base);
1934 } 2090 }
1935 break; 2091 break;
1936 } 2092 }
@@ -1961,14 +2117,15 @@ EXPORT_SYMBOL(vsscanf);
1961 * @fmt: formatting of buffer 2117 * @fmt: formatting of buffer
1962 * @...: resulting arguments 2118 * @...: resulting arguments
1963 */ 2119 */
1964int sscanf(const char * buf, const char * fmt, ...) 2120int sscanf(const char *buf, const char *fmt, ...)
1965{ 2121{
1966 va_list args; 2122 va_list args;
1967 int i; 2123 int i;
1968 2124
1969 va_start(args,fmt); 2125 va_start(args, fmt);
1970 i = vsscanf(buf,fmt,args); 2126 i = vsscanf(buf, fmt, args);
1971 va_end(args); 2127 va_end(args);
2128
1972 return i; 2129 return i;
1973} 2130}
1974EXPORT_SYMBOL(sscanf); 2131EXPORT_SYMBOL(sscanf);
generated by cgit v1.2.2 (git 2.25.0) at 2025-05-09 02:13:28 -0400