8 Sep
2005
8 Sep
'05
6:52 a.m.
- Move s(w)printf to rtl (cannot be shared in string because of
differences with the CRT implementation). - Fix build errors due to
previous commits (sorry).
Modified: trunk/reactos/include/ndk/rtlfuncs.h
Modified: trunk/reactos/include/ndk/zwfuncs.h
Modified: trunk/reactos/lib/crt/crt.xml
Deleted: trunk/reactos/lib/crt/ctype/
Modified: trunk/reactos/lib/ntdll/ntdll.xml
Deleted: trunk/reactos/lib/ntdll/stdio/
Modified: trunk/reactos/lib/rtl/rtl.xml
Added: trunk/reactos/lib/rtl/sprintf.c
Added: trunk/reactos/lib/rtl/swprintf.c
Modified: trunk/reactos/lib/string/ctype.c
Added: trunk/reactos/lib/string/scanf.h
Added: trunk/reactos/lib/string/sscanf.c
Modified: trunk/reactos/lib/string/string.xml
Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml
Deleted: trunk/reactos/ntoskrnl/rtl/ctype.c
Deleted: trunk/reactos/ntoskrnl/rtl/sprintf.c
Deleted: trunk/reactos/ntoskrnl/rtl/stdlib.c
Deleted: trunk/reactos/ntoskrnl/rtl/swprintf.c
_____
Modified: trunk/reactos/include/ndk/rtlfuncs.h
--- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-08 05:03:34 UTC
(rev 17734)
+++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-08 06:52:01 UTC
(rev 17735)
@@ -2013,4 +2013,29 @@
NTAPI
RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation);
+
+static __inline struct _PEB* NtCurrentPeb (void)
+{
+ struct _PEB * pPeb;
+
+#if defined(__GNUC__)
+
+ __asm__ __volatile__
+ (
+ "movl %%fs:0x30, %0\n" /* fs:30h == Teb->Peb */
+ : "=r" (pPeb) /* can't have two memory operands */
+ : /* no inputs */
+ );
+
+#elif defined(_MSC_VER)
+
+ __asm mov eax, fs:0x30;
+ __asm mov pPeb, eax
+
+#else
+#error Unknown compiler for inline assembler
#endif
+
+ return pPeb;
+}
+#endif
_____
Modified: trunk/reactos/include/ndk/zwfuncs.h
--- trunk/reactos/include/ndk/zwfuncs.h 2005-09-08 05:03:34 UTC (rev
17734)
+++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-08 06:52:01 UTC (rev
17735)
@@ -4350,29 +4350,4 @@
VOID
);
-
-static __inline struct _PEB* NtCurrentPeb (void)
-{
- struct _PEB * pPeb;
-
-#if defined(__GNUC__)
-
- __asm__ __volatile__
- (
- "movl %%fs:0x30, %0\n" /* fs:30h == Teb->Peb */
- : "=r" (pPeb) /* can't have two memory operands */
- : /* no inputs */
- );
-
-#elif defined(_MSC_VER)
-
- __asm mov eax, fs:0x30;
- __asm mov pPeb, eax
-
-#else
-#error Unknown compiler for inline assembler
#endif
-
- return pPeb;
-}
-#endif
_____
Modified: trunk/reactos/lib/crt/crt.xml
--- trunk/reactos/lib/crt/crt.xml 2005-09-08 05:03:34 UTC (rev
17734)
+++ trunk/reactos/lib/crt/crt.xml 2005-09-08 06:52:01 UTC (rev
17735)
@@ -22,17 +22,6 @@
<file>putch.c</file>
<file>ungetch.c</file>
</directory>
- <directory name="ctype">
- <file>ctype.c</file>
- <file>isalnum.c</file>
- <file>isascii.c</file>
- <file>iscntrl.c</file>
- <file>isgraph.c</file>
- <file>isprint.c</file>
- <file>ispunct.c</file>
- <file>isupper.c</file>
- <file>isctype.c</file>
- </directory>
<directory name="direct">
<file>chdir.c</file>
<file>chdrive.c</file>
_____
Modified: trunk/reactos/lib/ntdll/ntdll.xml
--- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 05:03:34 UTC (rev
17734)
+++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-08 06:52:01 UTC (rev
17735)
@@ -37,11 +37,6 @@
<file>libsupp.c</file>
<file>version.c</file>
</directory>
- <directory name="stdio">
- <file>sprintf.c</file>
- <file>sscanf.c</file>
- <file>swprintf.c</file>
- </directory>
<directory name="def">
<file>ntdll.rc</file>
</directory>
_____
Modified: trunk/reactos/lib/rtl/rtl.xml
--- trunk/reactos/lib/rtl/rtl.xml 2005-09-08 05:03:34 UTC (rev
17734)
+++ trunk/reactos/lib/rtl/rtl.xml 2005-09-08 06:52:01 UTC (rev
17735)
@@ -51,6 +51,8 @@
<file>sd.c</file>
<file>security.c</file>
<file>sid.c</file>
+ <file>sprintf.c</file>
+ <file>swprintf.c</file>
<file>splaytree.c</file>
<file>thread.c</file>
<file>time.c</file>
_____
Added: trunk/reactos/lib/rtl/sprintf.c
--- trunk/reactos/lib/rtl/sprintf.c 2005-09-08 05:03:34 UTC (rev
17734)
+++ trunk/reactos/lib/rtl/sprintf.c 2005-09-08 06:52:01 UTC (rev
17735)
@@ -0,0 +1,545 @@
+/*
+ * PROGRAMMERS: David Welch
+ * Eric Kohl
+ *
+ */
+
+/*
+ * linux/lib/vsprintf.c
+ *
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ */
+
+/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
+/*
+ * Wirzenius wrote this portably, Torvalds fucked it up :-)
+ */
+#include <rtl.h>
+
+#define ZEROPAD 1 /* pad with zero */
+#define SIGN 2 /* unsigned/signed long */
+#define PLUS 4 /* show plus */
+#define SPACE 8 /* space if plus */
+#define LEFT 16 /* left justified */
+#define SPECIAL 32 /* 0x */
+#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
+
+
+static
+__inline
+int
+do_div(long long *n, int base)
+{
+ int a;
+ a = ((unsigned long long) *n) % (unsigned) base;
+ *n = ((unsigned long long) *n) / (unsigned) base;
+ return a;
+}
+
+
+static int skip_atoi(const char **s)
+{
+ int i=0;
+
+ while (isdigit(**s))
+ i = i*10 + *((*s)++) - '0';
+ return i;
+}
+
+
+static char *
+number(char * buf, char * end, long long num, int base, int size, int
precision, int type)
+{
+ char c,sign,tmp[66];
+ const char *digits;
+ const char *small_digits =
"0123456789abcdefghijklmnopqrstuvwxyz";
+ const char *large_digits =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ int i;
+
+ digits = (type & LARGE) ? large_digits : small_digits;
+ if (type & LEFT)
+ type &= ~ZEROPAD;
+ if (base < 2 || base > 36)
+ return 0;
+ c = (type & ZEROPAD) ? '0' : ' ';
+ sign = 0;
+ if (type & SIGN) {
+ if (num < 0) {
+ sign = '-';
+ num = -num;
+ size--;
+ } else if (type & PLUS) {
+ sign = '+';
+ size--;
+ } else if (type & SPACE) {
+ sign = ' ';
+ size--;
+ }
+ }
+ if (type & SPECIAL) {
+ if (base == 16)
+ size -= 2;
+ else if (base == 8)
+ size--;
+ }
+ i = 0;
+ if (num == 0)
+ tmp[i++]='0';
+ else while (num != 0)
+ tmp[i++] = digits[do_div(&num,base)];
+ if (i > precision)
+ precision = i;
+ size -= precision;
+ if (!(type&(ZEROPAD+LEFT))) {
+ while(size-->0) {
+ if (buf <= end)
+ *buf = ' ';
+ ++buf;
+ }
+ }
+ if (sign) {
+ if (buf <= end)
+ *buf = sign;
+ ++buf;
+ }
+ if (type & SPECIAL) {
+ if (base==8) {
+ if (buf <= end)
+ *buf = '0';
+ ++buf;
+ } else if (base==16) {
+ if (buf <= end)
+ *buf = '0';
+ ++buf;
+ if (buf <= end)
+ *buf = digits[33];
+ ++buf;
+ }
+ }
+ if (!(type & LEFT)) {
+ while (size-- > 0) {
+ if (buf <= end)
+ *buf = c;
+ ++buf;
+ }
+ }
+ while (i < precision--) {
+ if (buf <= end)
+ *buf = '0';
+ ++buf;
+ }
+ while (i-- > 0) {
+ if (buf <= end)
+ *buf = tmp[i];
+ ++buf;
+ }
+ while (size-- > 0) {
+ if (buf <= end)
+ *buf = ' ';
+ ++buf;
+ }
+ return buf;
+}
+
+static char*
+string(char* buf, char* end, const char* s, int len, int field_width,
int precision, int flags)
+{
+ int i;
+ if (s == NULL)
+ {
+ s = "<NULL>";
+ len = 6;
+ }
+ else
+ {
+ if (len == -1)
+ {
+ len = 0;
+ while ((unsigned int)len < (unsigned
int)precision && s[len])
+ len++;
+ }
+ else
+ {
+ if ((unsigned int)len > (unsigned int)precision)
+ len = precision;
+ }
+ }
+ if (!(flags & LEFT))
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = ' ';
+ ++buf;
+ }
+ for (i = 0; i < len; ++i)
+ {
+ if (buf <= end)
+ *buf = *s++;
+ ++buf;
+ }
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = ' ';
+ ++buf;
+ }
+ return buf;
+}
+
+static char*
+stringw(char* buf, char* end, const wchar_t* sw, int len, int
field_width, int precision, int flags)
+{
+ int i;
+ if (sw == NULL)
+ {
+ sw = L"<NULL>";
+ len = 6;
+ }
+ else
+ {
+ if (len == -1)
+ {
+ len = 0;
+ while ((unsigned int)len < (unsigned
int)precision && sw[len])
+ len++;
+ }
+ else
+ {
+ if ((unsigned int)len > (unsigned int)precision)
+ len = precision;
+ }
+ }
+ if (!(flags & LEFT))
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = ' ';
+ ++buf;
+ }
+ for (i = 0; i < len; ++i)
+ {
+ if (buf <= end)
+ *buf = (unsigned char)(*sw++);
+ ++buf;
+ }
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = ' ';
+ ++buf;
+ }
+ return buf;
+}
+
+/*
+ * @implemented
+ */
+int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args)
+{
+ int len;
+ unsigned long long num;
+ int base;
+ char *str, *end;
+ const char *s;
+ const wchar_t *sw;
+
+ int flags; /* flags to number() */
+
+ int field_width; /* width of output field */
+ int precision; /* min. # of digits for integers; max
+ number of chars for from string */
+ int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for
integer
fields */
+
+ str = buf;
+ end = buf + cnt - 1;
+ if (end < buf - 1) {
+ end = ((void *) -1);
+ cnt = end - buf + 1;
+ }
+
+ for ( ; *fmt ; ++fmt) {
+ if (*fmt != '%') {
+ if (str <= end)
+ *str = *fmt;
+ ++str;
+ continue;
+ }
+
+ /* process flags */
+ flags = 0;
+ repeat:
+ ++fmt; /* this also skips first '%' */
+ switch (*fmt) {
+ case '-': flags |= LEFT; goto repeat;
+ case '+': flags |= PLUS; goto repeat;
+ case ' ': flags |= SPACE; goto repeat;
+ case '#': flags |= SPECIAL; goto repeat;
+ case '0': flags |= ZEROPAD; goto repeat;
+ }
+
+ /* get field width */
+ field_width = -1;
+ if (isdigit(*fmt))
+ field_width = skip_atoi(&fmt);
+ else if (*fmt == '*') {
+ ++fmt;
+ /* it's the next argument */
+ field_width = va_arg(args, int);
+ if (field_width < 0) {
+ field_width = -field_width;
+ flags |= LEFT;
+ }
+ }
+
+ /* get the precision */
+ precision = -1;
+ if (*fmt == '.') {
+ ++fmt;
+ if (isdigit(*fmt))
+ precision = skip_atoi(&fmt);
+ else if (*fmt == '*') {
+ ++fmt;
+ /* it's the next argument */
+ precision = va_arg(args, int);
+ }
+ if (precision < 0)
+ precision = 0;
+ }
+
+ /* get the conversion qualifier */
+ qualifier = -1;
+ if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt ==
'w') {
+ qualifier = *fmt;
+ ++fmt;
+ } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2)
==
'4') {
+ qualifier = *fmt;
+ fmt += 3;
+ }
+
+ /* default base */
+ base = 10;
+
+ switch (*fmt) {
+ case 'c': /* finished */
+ if (!(flags & LEFT))
+ while (--field_width > 0) {
+ if (str <= end)
+ *str = ' ';
+ ++str;
+ }
+ if (qualifier == 'l' || qualifier == 'w') {
+ if (str <= end)
+ *str = (unsigned char)(wchar_t)
va_arg(args, int);
+ ++str;
+ } else {
+ if (str <= end)
+ *str = (unsigned char)
va_arg(args, int);
+ ++str;
+ }
+ while (--field_width > 0) {
+ if (str <= end)
+ *str = ' ';
+ ++str;
+ }
+ continue;
+
+ case 'C': /* finished */
+ if (!(flags & LEFT))
+ while (--field_width > 0) {
+ if (str <= end)
+ *str = ' ';
+ ++str;
+ }
+ if (qualifier == 'h') {
+ if (str <= end)
+ *str = (unsigned char)
va_arg(args, int);
+ ++str;
+ } else {
+ if (str <= end)
+ *str = (unsigned char)(wchar_t)
va_arg(args, int);
+ ++str;
+ }
+ while (--field_width > 0) {
+ if (str <= end)
+ *str = ' ';
+ ++str;
+ }
+ continue;
+
+ case 's': /* finished */
+ if (qualifier == 'l' || qualifier == 'w') {
+ /* print unicode string */
+ sw = va_arg(args, wchar_t *);
+ str = stringw(str, end, sw, -1,
field_width, precision, flags);
+ } else {
+ /* print ascii string */
+ s = va_arg(args, char *);
+ str = string(str, end, s, -1,
field_width, precision, flags);
+ }
+ continue;
+
+ case 'S':
+ if (qualifier == 'h') {
+ /* print ascii string */
+ s = va_arg(args, char *);
+ str = string(str, end, s, -1,
field_width, precision, flags);
+ } else {
+ /* print unicode string */
+ sw = va_arg(args, wchar_t *);
+ str = stringw(str, end, sw, -1,
field_width, precision, flags);
+ }
+ continue;
+
+ case 'Z':
+ if (qualifier == 'w') {
+ /* print counted unicode string */
+ PUNICODE_STRING pus = va_arg(args,
PUNICODE_STRING);
+ if ((pus == NULL) || (pus->Buffer ==
NULL)) {
+ sw = NULL;
+ len = -1;
+ } else {
+ sw = pus->Buffer;
+ len = pus->Length /
sizeof(WCHAR);
+ }
+ str = stringw(str, end, sw, len,
field_width, precision, flags);
+ } else {
+ /* print counted ascii string */
+ PANSI_STRING pus = va_arg(args,
PANSI_STRING);
+ if ((pus == NULL) || (pus->Buffer ==
NULL)) {
+ s = NULL;
+ len = -1;
+ } else {
+ s = pus->Buffer;
+ len = pus->Length;
+ }
+ str = string(str, end, s, len,
field_width, precision, flags);
+ }
+ continue;
+
+ case 'p':
+ if (field_width == -1) {
+ field_width = 2 * sizeof(void *);
+ flags |= ZEROPAD;
+ }
+ str = number(str, end,
+ (unsigned long) va_arg(args, void *),
16,
+ field_width, precision, flags);
+ continue;
+
+ case 'n':
+ /* FIXME: What does C99 say about the overflow
case here? */
+ if (qualifier == 'l') {
+ long * ip = va_arg(args, long *);
+ *ip = (str - buf);
+ } else {
+ int * ip = va_arg(args, int *);
+ *ip = (str - buf);
+ }
+ continue;
+
+ /* integer number formats - set up the flags and "break"
*/
+ case 'o':
+ base = 8;
+ break;
+
+ case 'b':
+ base = 2;
+ break;
+
+ case 'X':
+ flags |= LARGE;
+ case 'x':
+ base = 16;
+ break;
+
+ case 'd':
+ case 'i':
+ flags |= SIGN;
+ case 'u':
+ break;
+
+ default:
+ if (*fmt != '%') {
+ if (str <= end)
+ *str = '%';
+ ++str;
+ }
+ if (*fmt) {
+ if (str <= end)
+ *str = *fmt;
+ ++str;
+ } else
+ --fmt;
+ continue;
+ }
+
+ if (qualifier == 'I')
+ num = va_arg(args, unsigned long long);
+ else if (qualifier == 'l') {
+ if (flags & SIGN)
+ num = va_arg(args, long);
+ else
+ num = va_arg(args, unsigned long);
+ }
+ else if (qualifier == 'h') {
+ if (flags & SIGN)
+ num = va_arg(args, int);
+ else
+ num = va_arg(args, unsigned int);
+ }
+ else {
+ if (flags & SIGN)
+ num = va_arg(args, int);
+ else
+ num = va_arg(args, unsigned int);
+ }
+ str = number(str, end, num, base, field_width,
precision, flags);
+ }
+ if (str <= end)
+ *str = '\0';
+ else if (cnt > 0)
+ /* don't write out a null byte if the buf size is zero
*/
+ *end = '\0';
+ return str-buf;
+}
+
+
+/*
+ * @implemented
+ */
+int sprintf(char * buf, const char *fmt, ...)
+{
+ va_list args;
+ int i;
+
+ va_start(args, fmt);
+ i=_vsnprintf(buf,MAXLONG,fmt,args);
+ va_end(args);
+ return i;
+}
+
+
+/*
+ * @implemented
+ */
+int _snprintf(char * buf, size_t cnt, const char *fmt, ...)
+{
+ va_list args;
+ int i;
+
+ va_start(args, fmt);
+ i=_vsnprintf(buf,cnt,fmt,args);
+ va_end(args);
+ return i;
+}
+
+
+/*
+ * @implemented
+ */
+int vsprintf(char *buf, const char *fmt, va_list args)
+{
+ return _vsnprintf(buf,MAXLONG,fmt,args);
+}
+
+/* EOF */
_____
Added: trunk/reactos/lib/rtl/swprintf.c
--- trunk/reactos/lib/rtl/swprintf.c 2005-09-08 05:03:34 UTC (rev
17734)
+++ trunk/reactos/lib/rtl/swprintf.c 2005-09-08 06:52:01 UTC (rev
17735)
@@ -0,0 +1,545 @@
+/*
+ * PROGRAMMERS: David Welch
+ * Eric Kohl
+ *
+ * TODO:
+ * - Verify the implementation of '%Z'.
+ */
+
+/*
+ * linux/lib/vsprintf.c
+ *
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ */
+
+/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
+/*
+ * Wirzenius wrote this portably, Torvalds fucked it up :-)
+ */
+
+#include <rtl.h>
+
+#define ZEROPAD 1 /* pad with zero */
+#define SIGN 2 /* unsigned/signed long */
+#define PLUS 4 /* show plus */
+#define SPACE 8 /* space if plus */
+#define LEFT 16 /* left justified */
+#define SPECIAL 32 /* 0x */
+#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
+
+
+static
+__inline
+int
+do_div(long long *n, int base)
+{
+ int a;
+ a = ((unsigned long long) *n) % (unsigned) base;
+ *n = ((unsigned long long) *n) / (unsigned) base;
+ return a;
+}
+
+
+static int skip_atoi(const wchar_t **s)
+{
+ int i=0;
+
+ while (iswdigit(**s))
+ i = i*10 + *((*s)++) - L'0';
+ return i;
+}
+
+
+static wchar_t *
+number(wchar_t * buf, wchar_t * end, long long num, int base, int size,
int precision, int type)
+{
+ wchar_t c, sign, tmp[66];
+ const wchar_t *digits;
+ const wchar_t *small_digits =
L"0123456789abcdefghijklmnopqrstuvwxyz";
+ const wchar_t *large_digits =
L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ int i;
+
+ digits = (type & LARGE) ? large_digits : small_digits;
+ if (type & LEFT)
+ type &= ~ZEROPAD;
+ if (base < 2 || base > 36)
+ return 0;
+ c = (type & ZEROPAD) ? L'0' : L' ';
+ sign = 0;
+ if (type & SIGN) {
+ if (num < 0) {
+ sign = L'-';
+ num = -num;
+ size--;
+ } else if (type & PLUS) {
+ sign = L'+';
+ size--;
+ } else if (type & SPACE) {
+ sign = ' ';
+ size--;
+ }
+ }
+ if (type & SPECIAL) {
+ if (base == 16)
+ size -= 2;
+ else if (base == 8)
+ size--;
+ }
+ i = 0;
+ if (num == 0)
+ tmp[i++] = L'0';
+ else while (num != 0)
+ tmp[i++] = digits[do_div(&num,base)];
+ if (i > precision)
+ precision = i;
+ size -= precision;
+ if (!(type&(ZEROPAD+LEFT))) {
+ while(size-->0) {
+ if (buf <= end)
+ *buf = L' ';
+ ++buf;
+ }
+ }
+ if (sign) {
+ if (buf <= end)
+ *buf = sign;
+ ++buf;
+ }
+ if (type & SPECIAL) {
+ if (base==8) {
+ if (buf <= end)
+ *buf = L'0';
+ ++buf;
+ } else if (base==16) {
+ if (buf <= end)
+ *buf = L'0';
+ ++buf;
+ if (buf <= end)
+ *buf = digits[33];
+ ++buf;
+ }
+ }
+ if (!(type & LEFT)) {
+ while (size-- > 0) {
+ if (buf <= end)
+ *buf = c;
+ ++buf;
+ }
+ }
+ while (i < precision--) {
+ if (buf <= end)
+ *buf = L'0';
+ ++buf;
+ }
+ while (i-- > 0) {
+ if (buf <= end)
+ *buf = tmp[i];
+ ++buf;
+ }
+ while (size-- > 0) {
+ if (buf <= end)
+ *buf = L' ';
+ ++buf;
+ }
+ return buf;
+}
+
+static wchar_t*
+string(wchar_t* buf, wchar_t* end, const char* s, int len, int
field_width, int precision, int flags)
+{
+ int i;
+ if (s == NULL)
+ {
+ s = "<NULL>";
+ len = 6;
+ }
+ else
+ {
+ if (len == -1)
+ {
+ len = 0;
+ while ((unsigned int)len < (unsigned
int)precision && s[len])
+ len++;
+ }
+ else
+ {
+ if ((unsigned int)len > (unsigned int)precision)
+ len = precision;
+ }
+ }
+ if (!(flags & LEFT))
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = L' ';
+ ++buf;
+ }
+ for (i = 0; i < len; ++i)
+ {
+ if (buf <= end)
+ *buf = *s++;
+ ++buf;
+ }
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = L' ';
+ ++buf;
+ }
+ return buf;
+}
+
+static wchar_t*
+stringw(wchar_t* buf, wchar_t* end, const wchar_t* sw, int len, int
field_width, int precision, int flags)
+{
+ int i;
+ if (sw == NULL)
+ {
+ sw = L"<NULL>";
+ len = 6;
+ }
+ else
+ {
+ if (len == -1)
+ {
+ len = 0;
+ while ((unsigned int)len < (unsigned
int)precision && sw[len])
+ len++;
+ }
+ else
+ {
+ if ((unsigned int)len > (unsigned int)precision)
+ len = precision;
+ }
+ }
+ if (!(flags & LEFT))
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = L' ';
+ buf++;
+ }
+ for (i = 0; i < len; ++i)
+ {
+ if (buf <= end)
+ *buf = *sw++;
+ buf++;
+ }
+ while (len < field_width--)
+ {
+ if (buf <= end)
+ *buf = L' ';
+ buf++;
+ }
+ return buf;
+}
+
+/*
+ * @implemented
+ */
+int _vsnwprintf(wchar_t *buf, size_t cnt, const wchar_t *fmt, va_list
args)
+{
+ int len;
+ unsigned long long num;
+ int base;
+ wchar_t * str, * end;
+ const char *s;
+ const wchar_t *sw;
+
+ int flags; /* flags to number() */
+
+ int field_width; /* width of output field */
+ int precision; /* min. # of digits for integers; max
+ number of chars for from string */
+ int qualifier; /* 'h', 'l', 'L', 'w' or 'I' for
integer
fields */
+
+ str = buf;
+ end = buf + cnt - 1;
+ if (end < buf - 1) {
+ end = ((void *) -1);
+ cnt = end - buf + 1;
+ }
+
+ for ( ; *fmt ; ++fmt) {
+ if (*fmt != L'%') {
+ if (str <= end)
+ *str = *fmt;
+ ++str;
+ continue;
+ }
+
+ /* process flags */
+ flags = 0;
+ repeat:
+ ++fmt; /* this also skips first '%' */
+ switch (*fmt) {
+ case L'-': flags |= LEFT; goto repeat;
+ case L'+': flags |= PLUS; goto repeat;
+ case L' ': flags |= SPACE; goto repeat;
+ case L'#': flags |= SPECIAL; goto
repeat;
+ case L'0': flags |= ZEROPAD; goto
repeat;
+ }
+
+ /* get field width */
+ field_width = -1;
+ if (iswdigit(*fmt))
+ field_width = skip_atoi(&fmt);
+ else if (*fmt == L'*') {
+ ++fmt;
+ /* it's the next argument */
+ field_width = va_arg(args, int);
+ if (field_width < 0) {
+ field_width = -field_width;
+ flags |= LEFT;
+ }
+ }
+
+ /* get the precision */
+ precision = -1;
+ if (*fmt == L'.') {
+ ++fmt;
+ if (iswdigit(*fmt))
+ precision = skip_atoi(&fmt);
+ else if (*fmt == L'*') {
+ ++fmt;
+ /* it's the next argument */
+ precision = va_arg(args, int);
+ }
+ if (precision < 0)
+ precision = 0;
+ }
+
+ /* get the conversion qualifier */
+ qualifier = -1;
+ if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt
== L'w') {
+ qualifier = *fmt;
+ ++fmt;
+ } else if (*fmt == L'I' && *(fmt+1) == L'6' &&
*(fmt+2)
== L'4') {
+ qualifier = *fmt;
+ fmt += 3;
+ }
+
+ /* default base */
+ base = 10;
+
+ switch (*fmt) {
+ case L'c':
[truncated at 1000 lines; 2962 more skipped]