github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Updates to string formating functions

Browse Source 
darcs-hash:20051006103052-ac50b-78e27365d2b2412ffced94825f37cbf6c0fa4d45.gz
This commit is contained in:
axel 2005-10-06 20:30:52 +10:00
parent 2d77235890
commit 401e060c05
2 changed files with 90 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fish_tests.c
View File

@ -69,7 +69,6 @@ static void ok()
wprintf( L"OK\n" ); wprintf( L"OK\n" );
} }
static int pq_compare( void *e1, void *e2 ) static int pq_compare( void *e1, void *e2 )
{ {
return e1-e2; return e1-e2;

130
wutil.c
View File

@ -228,8 +228,8 @@ static int vgwprintf( void (*writer)(wchar_t),
int width = 0; int width = 0;
filter++; filter++;
int loop=1; int loop=1;
int precision=INT_MAX; int precision=-1;
while( loop ) while( loop )
{ {
switch(*filter) switch(*filter)
@ -291,11 +291,26 @@ static int vgwprintf( void (*writer)(wchar_t),
break; break;
} }
case L's': case L's':
{ {
wchar_t *ss = is_long?va_arg(va, wchar_t*):str2wcs(va_arg(va, char*)); wchar_t *ss=0;
if( is_long )
{
ss = va_arg(va, void *);
}
else
{
char *ns = va_arg(va, char*);
if( ns )
{
ss = str2wcs( ns );
}
}
if( !ss ) if( !ss )
{
return -1; return -1;
}
if( width ) if( width )
{ {
@ -306,13 +321,13 @@ static int vgwprintf( void (*writer)(wchar_t),
count++; count++;
} }
} }
wchar_t *s=ss; wchar_t *s=ss;
int precount = count; int precount = count;
while( *s ) while( *s )
{ {
if( (precision <= (count-precount) ) ) if( (precision > 0) && (precision <= (count-precount) ) )
break; break;
writer( *(s++) ); writer( *(s++) );
@ -329,27 +344,38 @@ static int vgwprintf( void (*writer)(wchar_t),
case L'i': case L'i':
{ {
char str[32]; char str[32];
char *pos;
switch( is_long ) switch( is_long )
{ {
case 0: case 0:
{ {
int d = va_arg( va, int ); int d = va_arg( va, int );
snprintf( str, 32, "%.*d", precision, d ); if( precision > 0 )
snprintf( str, 32, "%.*d", precision, d );
else
snprintf( str, 32, "%d", d );
break; break;
} }
case 1: case 1:
{ {
long d = va_arg( va, long ); long d = va_arg( va, long );
snprintf( str, 32, "%.*ld", precision, d ); if( precision > 0 )
snprintf( str, 32, "%.*ld", precision, d );
else
snprintf( str, 32, "%ld", d );
break; break;
} }
case 2: case 2:
{ {
long long d = va_arg( va, long long ); long long d = va_arg( va, long long );
snprintf( str, 32, "%.*lld", precision, d ); if( precision > 0 )
snprintf( str, 32, "%.*lld", precision, d );
else
snprintf( str, 32, "%lld", d );
break; break;
} }
@ -360,27 +386,29 @@ static int vgwprintf( void (*writer)(wchar_t),
if( width ) if( width )
{ {
int i; int i;
for( i=strlen(str); i<width; i++ ) for( i=strlen(str); i<width; i++ )
{ {
writer( L' ' ); writer( L' ' );
count++; count++;
} }
} }
int c = gwprintf( writer, L"%s", str ); pos = str;
if( c==-1 )
return -1;
else
count += c;
while( *pos )
{
writer( *(pos++) );
count++;
}
break; break;
} }
case L'u': case L'u':
{ {
char str[32]; char str[32];
switch( is_long ) switch( is_long )
{ {
case 0: case 0:
@ -436,7 +464,7 @@ static int vgwprintf( void (*writer)(wchar_t),
} }
default: default:
debug( 0, L"Unknown switch %lc in string %ls\n", *filter, filter_org ); debug( 0, L"Unknown switch %lc in string %ls\n", *filter, filter_org );
exit(1); // exit(1);
} }
} }
else else
@ -454,10 +482,12 @@ static int gwprintf( void (*writer)(wchar_t),
... ) ... )
{ {
va_list va; va_list va;
int written;
va_start( va, filter ); va_start( va, filter );
int written=vgwprintf( writer, written=vgwprintf( writer,
filter, filter,
va ); va );
va_end( va ); va_end( va );
return written; return written;
} }
@ -474,7 +504,7 @@ static struct
sw_data; sw_data;
/** /**
Writer for swprintf Writers for string output
*/ */
static void sw_writer( wchar_t c ) static void sw_writer( wchar_t c )
{ {
@ -483,17 +513,16 @@ static void sw_writer( wchar_t c )
sw_data.count++; sw_data.count++;
} }
int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va )
int swprintf( wchar_t *out, size_t n, const wchar_t *filter, ... )
{ {
va_list va; int written;
va_start( va, filter );
sw_data.pos=out; sw_data.pos=out;
sw_data.max=n; sw_data.max=n;
sw_data.count=0; sw_data.count=0;
int written=vgwprintf( &sw_writer, written=vgwprintf( &sw_writer,
filter, filter,
va ); va );
if( written < n ) if( written < n )
{ {
*sw_data.pos = 0; *sw_data.pos = 0;
@ -503,6 +532,16 @@ int swprintf( wchar_t *out, size_t n, const wchar_t *filter, ... )
written=-1; written=-1;
} }
return written;
}
int swprintf( wchar_t *out, size_t n, const wchar_t *filter, ... )
{
va_list va;
int written;
va_start( va, filter );
written = vswprintf( out, n, filter, va );
va_end( va ); va_end( va );
return written; return written;
} }
@ -517,30 +556,41 @@ static void fw_writer( wchar_t c )
putw( c, fw_data ); putw( c, fw_data );
} }
/** /*
Writer for fwprintf and wprintf Writers for file output
*/ */
int vfwprintf( FILE *f, const wchar_t *filter, va_list va )
{
fw_data = f;
return vgwprintf( &fw_writer, filter, va );
}
int fwprintf( FILE *f, const wchar_t *filter, ... ) int fwprintf( FILE *f, const wchar_t *filter, ... )
{ {
va_list va; va_list va;
va_start( va, filter ); int written;
fw_data = f;
int written=vgwprintf( &fw_writer, filter, va ); va_start( va, filter );
written = vfwprintf( f, filter, va );
va_end( va ); va_end( va );
return written; return written;
} }
int vwprintf( const wchar_t *filter, va_list va )
{
fw_data=stdout;
return vgwprintf( &fw_writer, filter, va );
}
int wprintf( const wchar_t *filter, ... ) int wprintf( const wchar_t *filter, ... )
{ {
va_list va; va_list va;
va_start( va, filter ); int written;
fw_data = stdout;
int written=vgwprintf( &fw_writer, filter, va ); va_start( va, filter );
written=vwprintf( filter, va );
va_end( va ); va_end( va );
return written; return written;
} }
#endif #endif