JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* smallprint.cc (__small_vsprintf): Add format specifier 'W' for

Browse Source 
PWCHAR arguments.  Move wide char handling after char handling.
This commit is contained in:
Corinna Vinschen 2007-08-01 07:39:21 +00:00
parent f7c978d50f
commit 44587e392d
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-01 Corinna Vinschen <corinna@vinschen.de>
* smallprint.cc (__small_vsprintf): Add format specifier 'W' for
PWCHAR arguments. Move wide char handling after char handling.
2007-07-31 Corinna Vinschen <corinna@vinschen.de> 2007-07-31 Corinna Vinschen <corinna@vinschen.de>
* ntdll.h (RtlFreeAnsiString): Declare. * ntdll.h (RtlFreeAnsiString): Declare.

34
winsup/cygwin/smallprint.cc
View File

@ -66,6 +66,8 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
char tmp[CYG_MAX_PATH + 1]; char tmp[CYG_MAX_PATH + 1];
char *orig = dst; char *orig = dst;
const char *s; const char *s;
PWCHAR w;
UNICODE_STRING uw, *us;
DWORD err = GetLastError (); DWORD err = GetLastError ();
@ -171,9 +173,27 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
else else
s = tmp; s = tmp;
goto fillin; goto fillin;
case '.':
n = strtol (fmt, (char **) &fmt, 10);
if (*fmt++ != 's')
goto endfor;
case 's':
s = va_arg (ap, char *);
if (s == NULL)
s = "(null)";
fillin:
for (i = 0; *s && i < n; i++)
*dst++ = *s++;
break;
case 'W':
w = va_arg (ap, PWCHAR);
RtlInitUnicodeString (&uw, w);
us = &uw;
goto wfillin;
case 'S': case 'S':
us = va_arg (ap, PUNICODE_STRING);
wfillin:
{ {
PUNICODE_STRING us = va_arg (ap, PUNICODE_STRING);
ANSI_STRING as = { 0, 0, NULL }; ANSI_STRING as = { 0, 0, NULL };
NTSTATUS status; NTSTATUS status;
@ -194,18 +214,6 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
RtlFreeOemString (&as); RtlFreeOemString (&as);
} }
break; break;
case '.':
n = strtol (fmt, (char **) &fmt, 10);
if (*fmt++ != 's')
goto endfor;
case 's':
s = va_arg (ap, char *);
if (s == NULL)
s = "(null)";
fillin:
for (i = 0; *s && i < n; i++)
*dst++ = *s++;
break;
default: default:
*dst++ = '?'; *dst++ = '?';
*dst++ = fmt[-1]; *dst++ = fmt[-1];