73,17 → 73,21 |
* @param buf Buffer with size at least count bytes - NULL pointer NOT allowed! |
* @param count |
* @param ps output method and its data |
* @return number of printed characters |
* @return 0 on success, EOF on fail |
*/ |
static int printf_putnchars(const char * buf, size_t count, struct printf_spec *ps) |
{ |
return ps->write((void *)buf, count, ps->data); |
if (ps->write((void *)buf, count, ps->data) == count) { |
return 0; |
} |
|
return EOF; |
} |
|
/** Print string without added newline |
* @param str string to print |
* @param ps write function specification and support data |
* @return number of printed characters |
* @return 0 on success or EOF on fail |
*/ |
static int printf_putstr(const char * str, struct printf_spec *ps) |
{ |
105,13 → 109,17 |
/** Print one character to output |
* @param c one character |
* @param ps output method |
* @return number of printed characters |
* @return printed character or EOF |
*/ |
static int printf_putchar(int c, struct printf_spec *ps) |
{ |
unsigned char ch = c; |
|
return ps->write((void *) &ch, 1, ps->data); |
if (ps->write((void *) &ch, 1, ps->data) == 1) { |
return c; |
} |
|
return EOF; |
} |
|
/** Print one formatted character |
118,7 → 126,7 |
* @param c character to print |
* @param width |
* @param flags |
* @return number of printed characters |
* @return number of printed characters or EOF |
*/ |
static int print_char(char c, int width, uint64_t flags, struct printf_spec *ps) |
{ |
126,17 → 134,19 |
|
if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { |
while (--width > 0) { /* one space is consumed by character itself hence predecrement */ |
if (printf_putchar(' ', ps) > 0) |
++counter; |
/* FIXME: painful slow */ |
printf_putchar(' ', ps); |
++counter; |
} |
} |
|
if (printf_putchar(c, ps) > 0) |
counter++; |
|
if (printf_putchar(c, ps) == EOF) { |
return EOF; |
} |
|
while (--width > 0) { /* one space is consumed by character itself hence predecrement */ |
if (printf_putchar(' ', ps) > 0) |
++counter; |
printf_putchar(' ', ps); |
++counter; |
} |
|
return ++counter; |
147,7 → 157,7 |
* @param width |
* @param precision |
* @param flags |
* @return number of printed characters |
* @return number of printed characters or EOF |
*/ |
|
static int print_string(char *s, int width, int precision, uint64_t flags, struct printf_spec *ps) |
154,7 → 164,6 |
{ |
int counter = 0; |
size_t size; |
int retval; |
|
if (s == NULL) { |
return printf_putstr("(NULL)", ps); |
171,29 → 180,29 |
|
if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { |
while (width-- > 0) { |
if (printf_putchar(' ', ps) == 1) |
counter++; |
printf_putchar(' ', ps); |
counter++; |
} |
} |
|
while (precision > size) { |
precision--; |
if (printf_putchar(' ', ps) == 1) |
++counter; |
printf_putchar(' ', ps); |
++counter; |
} |
|
if ((retval = printf_putnchars(s, precision, ps)) < 0) { |
return -counter; |
if (printf_putnchars(s, precision, ps) == EOF) { |
return EOF; |
} |
|
counter += retval; |
counter += precision; |
|
while (width-- > 0) { |
if (printf_putchar(' ', ps) == 1) |
++counter; |
printf_putchar(' ', ps); |
++counter; |
} |
|
return counter; |
return ++counter; |
} |
|
|
208,7 → 217,7 |
* @param base Base to print the number in (should |
* be in range 2 .. 16). |
* @param flags output modifiers |
* @return number of printed characters |
* @return number of written characters or EOF |
* |
*/ |
static int print_number(uint64_t num, int width, int precision, int base , uint64_t flags, struct printf_spec *ps) |
218,9 → 227,8 |
char *ptr = &d[PRINT_NUMBER_BUFFER_SIZE - 1]; |
int size = 0; /* size of number with all prefixes and signs */ |
int number_size; /* size of plain number */ |
int written = 0; |
char sgn; |
int retval; |
int counter = 0; |
|
if (flags & __PRINTF_FLAG_BIGCHARS) |
digits = digits_big; |
287,15 → 295,15 |
|
if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { |
while (width-- > 0) { |
if (printf_putchar(' ', ps) == 1) |
counter++; |
printf_putchar(' ', ps); |
written++; |
} |
} |
|
/* print sign */ |
if (sgn) { |
if (printf_putchar(sgn, ps) == 1) |
counter++; |
printf_putchar(sgn, ps); |
written++; |
} |
|
/* print prefix */ |
303,30 → 311,26 |
if (flags & __PRINTF_FLAG_PREFIX) { |
switch(base) { |
case 2: /* Binary formating is not standard, but usefull */ |
if (printf_putchar('0', ps) == 1) |
counter++; |
printf_putchar('0', ps); |
if (flags & __PRINTF_FLAG_BIGCHARS) { |
if (printf_putchar('B', ps) == 1) |
counter++; |
printf_putchar('B', ps); |
} else { |
if (printf_putchar('b', ps) == 1) |
counter++; |
printf_putchar('b', ps); |
} |
written += 2; |
break; |
case 8: |
if (printf_putchar('o', ps) == 1) |
counter++; |
printf_putchar('o', ps); |
written++; |
break; |
case 16: |
if (printf_putchar('0', ps) == 1) |
counter++; |
printf_putchar('0', ps); |
if (flags & __PRINTF_FLAG_BIGCHARS) { |
if (printf_putchar('X', ps) == 1) |
counter++; |
printf_putchar('X', ps); |
} else { |
if (printf_putchar('x', ps) == 1) |
counter++; |
printf_putchar('x', ps); |
} |
written += 2; |
break; |
} |
} |
334,25 → 338,23 |
/* print leading zeroes */ |
precision -= number_size; |
while (precision-- > 0) { |
if (printf_putchar('0', ps) == 1) |
counter++; |
printf_putchar('0', ps); |
written++; |
} |
|
|
/* print number itself */ |
|
if ((retval = printf_putstr(++ptr, ps)) > 0) { |
counter += retval; |
} |
written += printf_putstr(++ptr, ps); |
|
/* print ending spaces */ |
|
while (width-- > 0) { |
if (printf_putchar(' ', ps) == 1) |
counter++; |
printf_putchar(' ', ps); |
written++; |
} |
|
return counter; |
return written; |
} |
|
|
454,7 → 456,7 |
if (c == '%' ) { |
/* print common characters if any processed */ |
if (i > j) { |
if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) < 0) { /* error */ |
if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) == EOF) { /* error */ |
goto minus_out; |
} |
counter += retval; |
550,7 → 552,7 |
* String and character conversions. |
*/ |
case 's': |
if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) < 0) { |
if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) == EOF) { |
goto minus_out; |
}; |
|
559,7 → 561,7 |
goto next_char; |
case 'c': |
c = va_arg(ap, unsigned int); |
if ((retval = print_char(c, width, flags, ps)) < 0) { |
if ((retval = print_char(c, width, flags, ps)) == EOF) { |
goto minus_out; |
}; |
|
659,7 → 661,7 |
} |
} |
|
if ((retval = print_number(number, width, precision, base, flags, ps)) < 0 ) { |
if ((retval = print_number(number, width, precision, base, flags, ps)) == EOF ) { |
goto minus_out; |
}; |
|
672,7 → 674,7 |
} |
|
if (i > j) { |
if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) < 0) { /* error */ |
if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) == EOF) { /* error */ |
goto minus_out; |
} |
counter += retval; |