libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* smallprint.cc (hex_str): New const string. 

(__rn): Drop str and use hex_str instead.
	(__small_vsprintf): If 'l' modifier has been found, print subsequent
	multibyte or wide char string using the s, S, or W options in extended
	hex value layout.

	* fhandler_disk_file.cc (fhandler_disk_file::readdir): Print WCHAR
	and resulting multibyte filename in extended hex value layout in
	debug output.
This commit is contained in:
Corinna Vinschen 2009-10-30 09:02:30 +00:00
parent dc3d6d9093
commit 460af5f9c0
3 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,15 @@
2009-10-30 Corinna Vinschen <corinna@vinschen.de>
* smallprint.cc (hex_str): New const string.
(__rn): Drop str and use hex_str instead.
(__small_vsprintf): If 'l' modifier has been found, print subsequent
multibyte or wide char string using the s, S, or W options in extended
hex value layout.
* fhandler_disk_file.cc (fhandler_disk_file::readdir): Print WCHAR
and resulting multibyte filename in extended hex value layout in
debug output.
2009-10-26 Charles Wilson <cygwin@cwilson.fastmail.fm>
* lib/pseudo-reloc.c (__report_error) [CYGWIN]: Correct size bug

3
winsup/cygwin/fhandler_disk_file.cc
View File

@ -2053,7 +2053,8 @@ go_ahead:
res = 0;
}
syscall_printf ("%d = readdir (%p, %p) (%s)", res, dir, &de, res ? "***" : de->d_name);
syscall_printf ("%d = readdir (%p, %p) (L\"%lS\" > \"%ls\")", res, dir, &de,
res ? NULL : &fname, res ? "***" : de->d_name);
return res;
}

51
winsup/cygwin/smallprint.cc
View File

@ -21,13 +21,14 @@ details. */
#define rnarg(dst, base, dosign, len, pad) __rn ((dst), (base), (dosign), va_arg (ap, long), len, pad, LMASK)
#define rnargLL(dst, base, dosign, len, pad) __rn ((dst), (base), (dosign), va_arg (ap, unsigned long long), len, pad, LLMASK)
static const char hex_str[] = "0123456789ABCDEF";
static char __fastcall *
__rn (char *dst, int base, int dosign, long long val, int len, int pad, unsigned long long mask)
{
/* longest number is ULLONG_MAX, 18446744073709551615, 20 digits */
unsigned long long uval = 0;
char res[20];
static const char str[] = "0123456789ABCDEF";
int l = 0;
if (dosign && val < 0)
@ -47,7 +48,7 @@ __rn (char *dst, int base, int dosign, long long val, int len, int pad, unsigned
do
{
res[l++] = str[uval % base];
res[l++] = hex_str[uval % base];
uval /= base;
}
while (uval);
@ -75,6 +76,7 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
while (*fmt)
{
int i, n = 0x7fff;
bool l_opt = false;
if (*fmt != '%')
*dst++ = *fmt++;
else
@ -110,6 +112,7 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
len = len * 10 + (c - '0');
continue;
case 'l':
l_opt = true;
continue;
case 'c':
{
@ -184,7 +187,16 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
s = "(null)";
fillin:
for (i = 0; *s && i < n; i++)
*dst++ = *s++;
if (l_opt && ((*(unsigned char *)s <= 0x1f && *s != '\n')
|| *(unsigned char *)s >= 0x7f))
{
*dst++ = '\\';
*dst++ = 'x';
*dst++ = hex_str[*(unsigned char *)s >> 4];
*dst++ = hex_str[*(unsigned char *)s++ & 0xf];
}
else
*dst++ = *s++;
break;
case 'W':
w = va_arg (ap, PWCHAR);
@ -195,12 +207,30 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
if (!us)
RtlInitUnicodeString (us = &uw, L"(null)");
wfillin:
if (sys_wcstombs (tmp, NT_MAX_PATH, us->Buffer,
us->Length / sizeof (WCHAR)))
{
s = tmp;
goto fillin;
}
if (l_opt)
{
for (USHORT i = 0; i < us->Length / sizeof (WCHAR); ++i)
{
WCHAR w = us->Buffer[i];
if ((w <= 0x1f && w != '\n') || w >= 0x7f)
{
*dst++ = '\\';
*dst++ = 'x';
*dst++ = hex_str[(w >> 12) & 0xf];
*dst++ = hex_str[(w >> 8) & 0xf];
*dst++ = hex_str[(w >> 4) & 0xf];
*dst++ = hex_str[w & 0xf];
}
else
*dst++ = w;
}
}
else if (sys_wcstombs (tmp, NT_MAX_PATH, us->Buffer,
us->Length / sizeof (WCHAR)))
{
s = tmp;
goto fillin;
}
break;
default:
*dst++ = '?';
@ -288,7 +318,6 @@ __wrn (PWCHAR dst, int base, int dosign, long long val, int len, int pad, unsign
/* longest number is ULLONG_MAX, 18446744073709551615, 20 digits */
unsigned long long uval = 0;
WCHAR res[20];
static const WCHAR str[] = L"0123456789ABCDEF";
int l = 0;
if (dosign && val < 0)
@ -308,7 +337,7 @@ __wrn (PWCHAR dst, int base, int dosign, long long val, int len, int pad, unsign
do
{
res[l++] = str[uval % base];
res[l++] = hex_str[uval % base];
uval /= base;
}
while (uval);