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

Implement GNU extension wcsftime_l

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-08-23 17:41:50 +02:00
parent 463a8afaa5
commit e636fe3d48
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/libc/include/wchar.h
View File

@ -132,6 +132,10 @@ wchar_t *_EXFUN(_wcsdup_r, (struct _reent *, const wchar_t * ));
size_t _EXFUN(wcscspn, (const wchar_t *, const wchar_t *)); size_t _EXFUN(wcscspn, (const wchar_t *, const wchar_t *));
size_t _EXFUN(wcsftime, (wchar_t *__restrict, size_t, size_t _EXFUN(wcsftime, (wchar_t *__restrict, size_t,
const wchar_t *__restrict, const struct tm *__restrict)); const wchar_t *__restrict, const struct tm *__restrict));
#if __GNU_VISIBLE
size_t wcsftime_l (wchar_t *__restrict, size_t, const wchar_t *__restrict,
const struct tm *__restrict, locale_t);
#endif
size_t _EXFUN(wcslcat, (wchar_t *, const wchar_t *, size_t)); size_t _EXFUN(wcslcat, (wchar_t *, const wchar_t *, size_t));
size_t _EXFUN(wcslcpy, (wchar_t *, const wchar_t *, size_t)); size_t _EXFUN(wcslcpy, (wchar_t *, const wchar_t *, size_t));
size_t _EXFUN(wcslen, (const wchar_t *)); size_t _EXFUN(wcslen, (const wchar_t *));

5
newlib/libc/time/strftime.c
View File

@ -311,6 +311,7 @@ locale, hard-coding the "C" locale settings.
# define STRLEN(a) strlen(a) # define STRLEN(a) strlen(a)
# else # else
# define strftime wcsftime /* Alternate function name */ # define strftime wcsftime /* Alternate function name */
# define strftime_l wcsftime_l /* Alternate function name */
# define CHAR wchar_t /* string type basis */ # define CHAR wchar_t /* string type basis */
# define CQ(a) L##a /* character constant qualifier */ # define CQ(a) L##a /* character constant qualifier */
# define snprintf swprintf /* wide-char equivalent function name */ # define snprintf swprintf /* wide-char equivalent function name */
@ -1460,9 +1461,8 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
#endif /* !_WANT_C99_TIME_FORMATS */ #endif /* !_WANT_C99_TIME_FORMATS */
} }
#if !defined(MAKE_WCSFTIME)
size_t size_t
strftime_l (char *__restrict s, size_t maxsize, const char *__restrict format, strftime_l (CHAR *__restrict s, size_t maxsize, const CHAR *__restrict format,
const struct tm *__restrict tim_p, struct __locale_t *locale) const struct tm *__restrict tim_p, struct __locale_t *locale)
{ {
#ifdef _WANT_C99_TIME_FORMATS #ifdef _WANT_C99_TIME_FORMATS
@ -1479,7 +1479,6 @@ strftime_l (char *__restrict s, size_t maxsize, const char *__restrict format,
return __strftime (s, maxsize, format, tim_p, locale, NULL, NULL); return __strftime (s, maxsize, format, tim_p, locale, NULL, NULL);
#endif /* !_WANT_C99_TIME_FORMATS */ #endif /* !_WANT_C99_TIME_FORMATS */
} }
#endif
/* The remainder of this file can serve as a regression test. Compile /* The remainder of this file can serve as a regression test. Compile
* with -D_REGRESSION_TEST. */ * with -D_REGRESSION_TEST. */

1
winsup/cygwin/common.din
View File

@ -1522,6 +1522,7 @@ wcscpy NOSIGFE
wcscspn NOSIGFE wcscspn NOSIGFE
wcsdup NOSIGFE wcsdup NOSIGFE
wcsftime SIGFE wcsftime SIGFE
wcsftime_l SIGFE
wcslcat NOSIGFE wcslcat NOSIGFE
wcslcpy NOSIGFE wcslcpy NOSIGFE
wcslen NOSIGFE wcslen NOSIGFE