// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
const tm* __tm) const
{
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
- __strftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
+ _M_c_locale_timepunct);
#else
char* __old = strdup(setlocale(LC_ALL, NULL));
setlocale(LC_ALL, _M_name_timepunct);
- strftime(__s, __maxlen, __format, __tm);
+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
setlocale(LC_ALL, __old);
free(__old);
#endif
+ // Make sure __s is null terminated.
+ if (__len == 0)
+ __s[0] = '\0';
}
template<>
if (!__cloc)
{
// "C" locale
- _M_c_locale_timepunct = _S_c_locale;
+ _M_c_locale_timepunct = _S_get_c_locale();
_M_data->_M_date_format = "%m/%d/%y";
_M_data->_M_date_era_format = "%m/%d/%y";
_M_data->_M_amonth04 = "Apr";
_M_data->_M_amonth05 = "May";
_M_data->_M_amonth06 = "Jun";
- _M_data->_M_amonth07 = "July";
+ _M_data->_M_amonth07 = "Jul";
_M_data->_M_amonth08 = "Aug";
_M_data->_M_amonth09 = "Sep";
_M_data->_M_amonth10 = "Oct";
_M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
_M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
_M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
- _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT, __cloc);
+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
+ __cloc);
_M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
_M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
_M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
const tm* __tm) const
{
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
- __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
+ _M_c_locale_timepunct);
#else
char* __old = strdup(setlocale(LC_ALL, NULL));
setlocale(LC_ALL, _M_name_timepunct);
- wcsftime(__s, __maxlen, __format, __tm);
+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
setlocale(LC_ALL, __old);
free(__old);
#endif
+ // Make sure __s is null terminated.
+ if (__len == 0)
+ __s[0] = L'\0';
}
template<>
if (!__cloc)
{
// "C" locale
- _M_c_locale_timepunct = _S_c_locale;
+ _M_c_locale_timepunct = _S_get_c_locale();
_M_data->_M_date_format = L"%m/%d/%y";
_M_data->_M_date_era_format = L"%m/%d/%y";
_M_data->_M_amonth04 = L"Apr";
_M_data->_M_amonth05 = L"May";
_M_data->_M_amonth06 = L"Jun";
- _M_data->_M_amonth07 = L"July";
+ _M_data->_M_amonth07 = L"Jul";
_M_data->_M_amonth08 = L"Aug";
_M_data->_M_amonth09 = L"Sep";
_M_data->_M_amonth10 = L"Oct";
{
_M_c_locale_timepunct = _S_clone_c_locale(__cloc);
- _M_data->_M_date_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WD_FMT, __cloc));
- _M_data->_M_date_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_D_FMT, __cloc));
- _M_data->_M_time_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WT_FMT, __cloc));
- _M_data->_M_time_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_T_FMT, __cloc));
- _M_data->_M_date_time_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WD_T_FMT, __cloc));
- _M_data->_M_date_time_era_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc));
- _M_data->_M_am = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WAM_STR, __cloc));
- _M_data->_M_pm = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WPM_STR, __cloc));
- _M_data->_M_am_pm_format = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc));
+ union { char *__s; wchar_t *__w; } __u;
+
+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
+ _M_data->_M_date_format = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
+ _M_data->_M_date_era_format = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
+ _M_data->_M_time_format = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
+ _M_data->_M_time_era_format = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
+ _M_data->_M_date_time_format = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
+ _M_data->_M_date_time_era_format = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
+ _M_data->_M_am = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
+ _M_data->_M_pm = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
+ _M_data->_M_am_pm_format = __u.__w;
// Day names, starting with "C"'s Sunday.
- _M_data->_M_day1 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_1, __cloc));
- _M_data->_M_day2 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_2, __cloc));
- _M_data->_M_day3 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_3, __cloc));
- _M_data->_M_day4 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_4, __cloc));
- _M_data->_M_day5 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_5, __cloc));
- _M_data->_M_day6 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_6, __cloc));
- _M_data->_M_day7 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WDAY_7, __cloc));
+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
+ _M_data->_M_day1 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
+ _M_data->_M_day2 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
+ _M_data->_M_day3 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
+ _M_data->_M_day4 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
+ _M_data->_M_day5 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
+ _M_data->_M_day6 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
+ _M_data->_M_day7 = __u.__w;
// Abbreviated day names, starting with "C"'s Sun.
- _M_data->_M_aday1 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_1, __cloc));
- _M_data->_M_aday2 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_2, __cloc));
- _M_data->_M_aday3 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_3, __cloc));
- _M_data->_M_aday4 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_4, __cloc));
- _M_data->_M_aday5 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_5, __cloc));
- _M_data->_M_aday6 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_6, __cloc));
- _M_data->_M_aday7 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABDAY_7, __cloc));
+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
+ _M_data->_M_aday1 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
+ _M_data->_M_aday2 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
+ _M_data->_M_aday3 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
+ _M_data->_M_aday4 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
+ _M_data->_M_aday5 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
+ _M_data->_M_aday6 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
+ _M_data->_M_aday7 = __u.__w;
// Month names, starting with "C"'s January.
- _M_data->_M_month01 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_1, __cloc));
- _M_data->_M_month02 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_2, __cloc));
- _M_data->_M_month03 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_3, __cloc));
- _M_data->_M_month04 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_4, __cloc));
- _M_data->_M_month05 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_5, __cloc));
- _M_data->_M_month06 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_6, __cloc));
- _M_data->_M_month07 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_7, __cloc));
- _M_data->_M_month08 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_8, __cloc));
- _M_data->_M_month09 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_9, __cloc));
- _M_data->_M_month10 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_10, __cloc));
- _M_data->_M_month11 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_11, __cloc));
- _M_data->_M_month12 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WMON_12, __cloc));
+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
+ _M_data->_M_month01 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
+ _M_data->_M_month02 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
+ _M_data->_M_month03 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
+ _M_data->_M_month04 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
+ _M_data->_M_month05 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
+ _M_data->_M_month06 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
+ _M_data->_M_month07 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
+ _M_data->_M_month08 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
+ _M_data->_M_month09 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
+ _M_data->_M_month10 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
+ _M_data->_M_month11 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
+ _M_data->_M_month12 = __u.__w;
// Abbreviated month names, starting with "C"'s Jan.
- _M_data->_M_amonth01 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_1, __cloc));
- _M_data->_M_amonth02 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_2, __cloc));
- _M_data->_M_amonth03 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_3, __cloc));
- _M_data->_M_amonth04 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_4, __cloc));
- _M_data->_M_amonth05 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_5, __cloc));
- _M_data->_M_amonth06 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_6, __cloc));
- _M_data->_M_amonth07 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_7, __cloc));
- _M_data->_M_amonth08 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_8, __cloc));
- _M_data->_M_amonth09 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_9, __cloc));
- _M_data->_M_amonth10 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_10, __cloc));
- _M_data->_M_amonth11 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_11, __cloc));
- _M_data->_M_amonth12 = reinterpret_cast<wchar_t*>(__nl_langinfo_l(_NL_WABMON_12, __cloc));
+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
+ _M_data->_M_amonth01 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
+ _M_data->_M_amonth02 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
+ _M_data->_M_amonth03 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
+ _M_data->_M_amonth04 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
+ _M_data->_M_amonth05 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
+ _M_data->_M_amonth06 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
+ _M_data->_M_amonth07 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
+ _M_data->_M_amonth08 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
+ _M_data->_M_amonth09 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
+ _M_data->_M_amonth10 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
+ _M_data->_M_amonth11 = __u.__w;
+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
+ _M_data->_M_amonth12 = __u.__w;
}
}
#endif
OSDN Git Service
