#include <stdarg.h>
#include <stdlib.h>
#include <stddef.h>
+#include <string.h>
#ifndef REGTEST
static void intformat( intmax_t value, struct _PDCLIB_status_t * status )
{
+ if ( status->prec < 0 )
+ {
+ status->prec = 1;
+ }
/* At worst, we need two prefix characters (hex prefix). */
char preface[3] = "\0";
size_t preidx = 0;
}
}
{
- size_t prec_pads = ( status->prec > status->current ) ? ( status->prec - status->current ) : 0;
+ /* At this point, status->current has the number of digits queued up.
+ Determine if we have a precision requirement to pad those.
+ */
+ size_t prec_pads = ( (_PDCLIB_size_t)status->prec > status->current ) ? ( (_PDCLIB_size_t)status->prec - status->current ) : 0;
if ( ! ( status->flags & ( E_minus | E_zero ) ) )
{
/* Space padding is only done if no zero padding or left alignment
- is requested. Leave space for any prefixes determined above.
+ is requested. Calculate the number of characters that WILL be
+ printed, including any prefixes determined above.
*/
/* The number of characters to be printed, plus prefixes if any. */
/* This line contained probably the most stupid, time-wasting bug
I've ever perpetrated. Greetings to Samface, DevL, and all
sceners at Breakpoint 2006.
*/
- size_t characters = preidx + ( ( status->current > status->prec ) ? status->current : status->prec );
+ size_t characters = preidx + ( ( status->current > (_PDCLIB_size_t)status->prec ) ? status->current : (_PDCLIB_size_t)status->prec );
if ( status->width > characters )
{
for ( size_t i = 0; i < status->width - characters; ++i )
PUT( preface[ preidx++ ] );
++(status->current);
}
+ /* Do the precision padding if necessary. */
+ while ( prec_pads-- > 0 )
+ {
+ PUT( '0' );
+ ++(status->current);
+ }
if ( ( ! ( status->flags & E_minus ) ) && ( status->flags & E_zero ) )
{
/* If field is not left aligned, and zero padding is requested, do
++(status->current);
}
}
- /* Do the precision padding if necessary. */
- for ( size_t i = 0; i < prec_pads; ++i )
- {
- PUT( '0' );
- }
}
}
output once the number of characters to be printed is known, which happens
at the lowermost recursion level.
*/
+#define INT2BASE() \
+do \
+{ \
+ /* Special case: zero value, zero precision -- no output (but padding) */ \
+ if ( status->current == 0 && value == 0 && status->prec == 0 ) \
+ { \
+ intformat( value, status ); \
+ } \
+ else \
+ { \
+ /* Registering the character being printed at the end of the function here \
+ already so it will be taken into account when the deepestmost recursion \
+ does the prefix / padding stuff. \
+ */ \
+ ++(status->current); \
+ if ( ( value / status->base ) != 0 ) \
+ { \
+ /* More digits to be done - recurse deeper */ \
+ int2base( value / status->base, status ); \
+ } \
+ else \
+ { \
+ /* We reached the last digit, the deepest point of our recursion, and \
+ only now know how long the number to be printed actually is. Now we \
+ have to do the sign, prefix, width, and precision padding stuff \
+ before printing the numbers while we resurface from the recursion. \
+ */ \
+ intformat( value, status ); \
+ } \
+ /* Recursion tail - print the current digit. */ \
+ { \
+ int digit = value % status->base; \
+ if ( digit < 0 ) \
+ { \
+ digit *= -1; \
+ } \
+ if ( status->flags & E_lower ) \
+ { \
+ /* Lowercase letters. Same array used for strto...(). */ \
+ PUT( _PDCLIB_digits[ digit ] ); \
+ } \
+ else \
+ { \
+ /* Uppercase letters. Array only used here, only 0-F. */ \
+ PUT( _PDCLIB_Xdigits[ digit ] ); \
+ } \
+ } \
+ } \
+} while ( 0 )
+
+
static void int2base( intmax_t value, struct _PDCLIB_status_t * status )
{
- /* Registering the character being printed at the end of the function here
- already so it will be taken into account when the deepestmost recursion
- does the prefix / padding stuff.
- */
- ++(status->current);
- if ( ( value / status->base ) != 0 )
+ INT2BASE();
+}
+
+
+static void stringformat( const char * s, struct _PDCLIB_status_t * status )
+{
+ if ( status->flags & E_char )
{
- /* More digits to be done - recurse deeper */
- int2base( value / status->base, status );
+ status->prec = 1;
}
else
{
- /* We reached the last digit, the deepest point of our recursion, and
- only now know how long the number to be printed actually is. Now we
- have to do the sign, prefix, width, and precision padding stuff
- before printing the numbers while we resurface from the recursion.
- */
- intformat( value, status );
+ if ( status->prec < 0 )
+ {
+ status->prec = strlen( s );
+ }
+ else
+ {
+ for ( int i = 0; i < status->prec; ++i )
+ {
+ if ( s[i] == 0 )
+ {
+ status->prec = i;
+ break;
+ }
+ }
+ }
}
- /* Recursion tail - print the current digit. */
+ if ( ! ( status->flags & E_minus ) && ( status->width > (_PDCLIB_size_t)status->prec ) )
{
- int digit = value % status->base;
- if ( digit < 0 )
- {
- digit *= -1;
+ while ( status->current < ( status->width - status->prec ) )
+ {
+ PUT( ' ' );
+ ++(status->current);
+ }
}
- if ( status->flags & E_lower )
+ while ( status->prec > 0 )
{
- /* Lowercase letters. Same array used for strto...(). */
- PUT( _PDCLIB_digits[ digit ] );
+ PUT( *(s++) );
+ --(status->prec);
+ ++(status->current);
}
- else
+ if ( status->flags & E_minus )
{
- /* Uppercase letters. Array only used here, only 0-F. */
- PUT( _PDCLIB_Xdigits[ digit ] );
- }
+ while ( status->width > status->current )
+ {
+ PUT( ' ' );
+ ++(status->current);
+ }
}
}
status->base = 0;
status->current = 0;
status->width = 0;
- status->prec = 0;
+ status->prec = EOF;
/* First come 0..n flags */
do
EOF (negative), there is no need for testing for negative here.
*/
status->prec = va_arg( status->arg, int );
+ ++spec;
}
else
{
status->prec = (int)strtol( spec, &endptr, 10 );
if ( spec == endptr )
{
- /* Decimal point but no number - bad conversion specifier. */
- return orig_spec;
+ /* Decimal point but no number - equals zero */
+ status->prec = 0;
}
spec = endptr;
}
/* Having a precision cancels out any zero flag. */
- status->flags ^= E_zero;
+ status->flags &= ~E_zero;
}
/* Optional length modifier
case 'A':
break;
case 'c':
- /* TODO: Flags, wide chars. */
- PUT( va_arg( status->arg, int ) );
- return ++spec;
- case 's':
- /* TODO: Flags, wide chars. */
+ /* TODO: wide chars. */
{
- char * s = va_arg( status->arg, char * );
- while ( *s != '\0' )
- {
- PUT( *(s++) );
- }
+ char c[1];
+ c[0] = (char)va_arg( status->arg, int );
+ status->flags |= E_char;
+ stringformat( c, status );
return ++spec;
}
+ case 's':
+ /* TODO: wide chars. */
+ stringformat( va_arg( status->arg, char * ), status );
+ return ++spec;
case 'p':
- /* TODO: E_long -> E_intptr */
status->base = 16;
status->flags |= ( E_lower | E_unsigned | E_alt | E_pointer );
break;
puts( "UNSUPPORTED PRINTF FLAG COMBINATION" );
return NULL;
}
- ++(status->current);
- /* FIXME: The if clause means one-digit values do not get formatted */
- /* Was introduced originally to get value to "safe" levels re. uintmax_t. */
- if ( ( value / status->base ) != 0 )
- {
- int2base( (intmax_t)(value / status->base), status );
- }
- else
- {
- intformat( (intmax_t)value, status );
- }
- int digit = value % status->base;
- if ( digit < 0 )
- {
- digit *= -1;
- }
- if ( status->flags & E_lower )
- {
- PUT( _PDCLIB_digits[ digit ] );
- }
- else
- {
- PUT( _PDCLIB_Xdigits[ digit ] );
- }
+ INT2BASE();
}
else
{
+ intmax_t value;
switch ( status->flags & ( E_char | E_short | E_long | E_llong | E_intmax ) )
{
case E_char:
- int2base( (intmax_t)(char)va_arg( status->arg, int ), status );
+ value = (intmax_t)(char)va_arg( status->arg, int );
break;
case E_short:
- int2base( (intmax_t)(short)va_arg( status->arg, int ), status );
+ value = (intmax_t)(short)va_arg( status->arg, int );
break;
case 0:
- int2base( (intmax_t)va_arg( status->arg, int ), status );
+ value = (intmax_t)va_arg( status->arg, int );
break;
case E_long:
- int2base( (intmax_t)va_arg( status->arg, long ), status );
+ value = (intmax_t)va_arg( status->arg, long );
break;
case E_llong:
- int2base( (intmax_t)va_arg( status->arg, long long ), status );
+ value = (intmax_t)va_arg( status->arg, long long );
break;
case E_ptrdiff:
- int2base( (intmax_t)va_arg( status->arg, ptrdiff_t ), status );
+ value = (intmax_t)va_arg( status->arg, ptrdiff_t );
break;
case E_intmax:
- int2base( va_arg( status->arg, intmax_t ), status );
+ value = va_arg( status->arg, intmax_t );
break;
default:
puts( "UNSUPPORTED PRINTF FLAG COMBINATION" );
return NULL;
}
+ INT2BASE();
}
if ( status->flags & E_minus )
{
status.current = 0;
status.s = buffer;
status.width = 0;
- status.prec = 0;
+ status.prec = EOF;
status.stream = NULL;
va_start( status.arg, format );
memset( buffer, '\0', 100 );