Attachment 10228 Details for Bug 10871 – Provide backward compatibility for strftime family (version 8)

[patch] Provide backward compatibility for strftime family (version 8)

0006-Provide-backward-compatibility-for-strftime-family-b.patch (text/plain), 11.12 KB, created by Rafal Luzynski on 2017-06-28 00:29:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafal Luzynski

Created: 2017-06-28 00:29:10 UTC

Size: 11.12 KB

patch

obsolete

>From 792f7ace706745ae45aaf29f8c3df8e2d6486d8b Mon Sep 17 00:00:00 2001
>From: Rafal Luzynski <digitalfreak@lingonborough.com>
>Date: Sat, 15 Oct 2016 00:38:09 +0200
>Subject: [PATCH 06/16] Provide backward compatibility for strftime family (bug
> 10871).
>
>As %OB format specifier has been added to strftime/wcsftime
>family of functions backward compatibility implementation must be
>provided for older binaries which assume that %B returns
>a month name in the nominative case.
>
>[BZ #10871]
>* include/time.h: Declare __strftime_l_common.
>* include/wchar.h: Declare __wcsftime_l_common.
>* time/Versions (libc: GLIBC_2.26):
>  New (__)strftime(_l) and (__)wcsftime(_l) added.
>* time/strftime.c: Provide backward compatible version.
>* time/strftime_l.c: Likewise.
>* time/wcsftime.c: Likewise.
>* time/wcsftime_l.c: Likewise.
>---
> include/time.h    |  9 +++++++++
> include/wchar.h   |  9 +++++++++
> time/Versions     |  4 ++++
> time/strftime.c   | 20 +++++++++++++++++---
> time/strftime_l.c | 56 +++++++++++++++++++++++++++++++++++++++++++++----------
> time/wcsftime.c   | 22 ++++++++++++++++++----
> time/wcsftime_l.c | 26 +++++++++++++++++++++++++-
> 7 files changed, 128 insertions(+), 18 deletions(-)
>
>diff --git a/include/time.h b/include/time.h
>index 9956b82..567c443 100644
>--- a/include/time.h
>+++ b/include/time.h
>@@ -8,6 +8,15 @@ extern __typeof (strftime_l) __strftime_l;
> libc_hidden_proto (__strftime_l)
> extern __typeof (strptime_l) __strptime_l;
> 
>+/* Backward compatibility function: feature_OB argument specifies
>+   whether or not %OB format specifier should be implemented.  */
>+extern size_t __strftime_l_common (char *__restrict __s, size_t __maxsize,
>+				   const char *__restrict __format,
>+				   const struct tm *__restrict __tp,
>+				   const int feature_OB,
>+				   locale_t __loc) __THROW;
>+libc_hidden_proto (__strftime_l_common)
>+
> libc_hidden_proto (time)
> libc_hidden_proto (asctime)
> libc_hidden_proto (mktime)
>diff --git a/include/wchar.h b/include/wchar.h
>index 7bf042c..39cce2c 100644
>--- a/include/wchar.h
>+++ b/include/wchar.h
>@@ -25,6 +25,15 @@ libc_hidden_proto (__wcstof_l)
> libc_hidden_proto (__wcstold_l)
> libc_hidden_proto (__wcsftime_l)
> 
>+/* Backward compatibility function: feature_OB argument specifies
>+   whether or not %OB format specifier should be implemented.  */
>+extern size_t __wcsftime_l_common (wchar_t *__restrict __s, size_t __maxsize,
>+				   const wchar_t *__restrict __format,
>+				   const struct tm *__restrict __tp,
>+				   const int feature_OB,
>+				   locale_t __loc) __THROW;
>+libc_hidden_proto (__wcsftime_l_common)
>+
> 
> extern double __wcstod_internal (const wchar_t *__restrict __nptr,
> 				 wchar_t **__restrict __endptr, int __group)
>diff --git a/time/Versions b/time/Versions
>index fd83818..da38335 100644
>--- a/time/Versions
>+++ b/time/Versions
>@@ -65,4 +65,8 @@ libc {
>   GLIBC_2.16 {
>     timespec_get;
>   }
>+  GLIBC_2.26 {
>+    __strftime_l; __wcsftime_l;
>+    strftime; strftime_l; wcsftime; wcsftime_l;
>+  }
> }
>diff --git a/time/strftime.c b/time/strftime.c
>index eeab20e..709046e 100644
>--- a/time/strftime.c
>+++ b/time/strftime.c
>@@ -17,11 +17,25 @@
> 
> #include <time.h>
> #include <locale/localeinfo.h>
>+#include <shlib-compat.h>
> 
> 
> size_t
>-strftime (char *s, size_t maxsize, const char *format, const struct tm *tp)
>+__strftime (char *s, size_t maxsize, const char *format, const struct tm *tp)
> {
>-  return __strftime_l (s, maxsize, format, tp, _NL_CURRENT_LOCALE);
>+  return __strftime_l_common (s, maxsize, format, tp, 1, _NL_CURRENT_LOCALE);
> }
>-libc_hidden_def (strftime)
>+versioned_symbol (libc, __strftime, strftime, GLIBC_2_26);
>+libc_hidden_ver (__strftime, strftime)
>+
>+
>+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_26)
>+size_t
>+attribute_compat_text_section
>+__strftime_compat (char *s, size_t maxsize, const char *format,
>+		   const struct tm *tp)
>+{
>+  return __strftime_l_common (s, maxsize, format, tp, 0, _NL_CURRENT_LOCALE);
>+}
>+compat_symbol (libc, __strftime_compat, strftime, GLIBC_2_0);
>+#endif
>diff --git a/time/strftime_l.c b/time/strftime_l.c
>index 1c4bed8..1559a82 100644
>--- a/time/strftime_l.c
>+++ b/time/strftime_l.c
>@@ -56,6 +56,8 @@
> extern char *tzname[];
> #endif
> 
>+#include <shlib-compat.h>
>+
> /* Do multibyte processing if multibytes are supported, unless
>    multibyte sequences are safe in formats.  Multibyte sequences are
>    safe if they cannot contain byte sequences that look like format
>@@ -279,15 +281,19 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
>    function gets as an additional argument the locale which has to be
>    used.  To access the values we have to redefine the _NL_CURRENT
>    macro.  */
>-# define strftime		__strftime_l
>-# define wcsftime		__wcsftime_l
>+# define strftime		__strftime_l_common
>+# define wcsftime		__wcsftime_l_common
> # undef _NL_CURRENT
> # define _NL_CURRENT(category, item) \
>   (current->values[_NL_ITEM_INDEX (item)].string)
>+# define FEATURE_OB_PARAM , int feature_OB
>+# define FEATURE_OB_ARG , feature_OB
> # define LOCALE_PARAM , locale_t loc
> # define LOCALE_ARG , loc
> # define HELPER_LOCALE_ARG  , current
> #else
>+# define FEATURE_OB_PARAM
>+# define FEATURE_OB_ARG
> # define LOCALE_PARAM
> # define LOCALE_ARG
> # ifdef _LIBC
>@@ -435,6 +441,7 @@ static CHAR_T const month_name[][10] =
> static size_t __strftime_internal (CHAR_T *, size_t, const CHAR_T *,
> 				   const struct tm *, bool *
> 				   ut_argument_spec
>+				   FEATURE_OB_PARAM
> 				   LOCALE_PARAM) __THROW;
> 
> /* Write information from TP into S according to the format
>@@ -446,7 +453,7 @@ static size_t __strftime_internal (CHAR_T *, size_t, const CHAR_T *,
> 
> size_t
> my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format,
>-	     const struct tm *tp ut_argument_spec LOCALE_PARAM)
>+	     const struct tm *tp ut_argument_spec FEATURE_OB_PARAM LOCALE_PARAM)
> {
> #if !defined _LIBC && HAVE_TZNAME && HAVE_TZSET
>   /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime.
>@@ -457,7 +464,7 @@ my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format,
> #endif
>   bool tzset_called = false;
>   return __strftime_internal (s, maxsize, format, tp, &tzset_called
>-			      ut_argument LOCALE_ARG);
>+			      ut_argument FEATURE_OB_ARG LOCALE_ARG);
> }
> #ifdef _LIBC
> libc_hidden_def (my_strftime)
>@@ -466,10 +473,12 @@ libc_hidden_def (my_strftime)
> static size_t
> __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
> 		     const struct tm *tp, bool *tzset_called
>-		     ut_argument_spec LOCALE_PARAM)
>+		     ut_argument_spec FEATURE_OB_PARAM LOCALE_PARAM)
> {
> #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
>   struct __locale_data *const current = loc->__locales[LC_TIME];
>+#else
>+# define feature_OB 1
> #endif
> 
>   int hour12 = tp->tm_hour;
>@@ -791,13 +800,15 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
> 	case L_('B'):
> 	  if (modifier == L_('E'))
> 	    goto bad_format;
>+	  if (!feature_OB && modifier == L_('O'))
>+	    goto bad_format;
> 	  if (change_case)
> 	    {
> 	      to_uppcase = 1;
> 	      to_lowcase = 0;
> 	    }
> #if defined _NL_CURRENT || !HAVE_STRFTIME
>-	  if (modifier == L_('O'))
>+	  if (!feature_OB || modifier == L_('O'))
> 	    cpy (STRLEN (f_altmonth), f_altmonth);
> 	  else
> 	    cpy (STRLEN (f_month), f_month);
>@@ -829,10 +840,10 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
> 	    CHAR_T *old_start = p;
> 	    size_t len = __strftime_internal (NULL, (size_t) -1, subfmt,
> 					      tp, tzset_called ut_argument
>-					      LOCALE_ARG);
>+					      FEATURE_OB_ARG LOCALE_ARG);
> 	    add (len, __strftime_internal (p, maxsize - i, subfmt,
> 					   tp, tzset_called ut_argument
>-					   LOCALE_ARG));
>+					   FEATURE_OB_ARG LOCALE_ARG));
> 
> 	    if (to_uppcase)
> 	      while (old_start < p)
>@@ -1433,10 +1444,35 @@ size_t
> emacs_strftime (char *s, size_t maxsize, const char *format,
> 		const struct tm *tp)
> {
>-  return my_strftime (s, maxsize, format, tp, 0);
>+  return my_strftime (s, maxsize, format, tp, 1, 0);
> }
> #endif
> 
> #if defined _LIBC && !defined COMPILE_WIDE
>-weak_alias (__strftime_l, strftime_l)
>+size_t
>+__strftime_l_internal (char *s, size_t maxsize, const char *format,
>+		       const struct tm *tp, locale_t loc)
>+{
>+  return my_strftime (s, maxsize, format, tp, 1, loc);
>+}
>+strong_alias (__strftime_l_internal, __strftime_l_internal_alias)
>+versioned_symbol (libc, __strftime_l_internal_alias,
>+		  __strftime_l, GLIBC_2_26);
>+libc_hidden_ver (__strftime_l_internal_alias, __strftime_l)
>+versioned_symbol (libc, __strftime_l_internal, strftime_l, GLIBC_2_26);
>+libc_hidden_ver (__strftime_l_internal, strftime_l)
>+
>+# if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_26)
>+size_t
>+attribute_compat_text_section
>+__strftime_l_compat (char *s, size_t maxsize, const char *format,
>+		     const struct tm *tp, locale_t loc)
>+{
>+  return my_strftime (s, maxsize, format, tp, 0, loc);
>+}
>+strong_alias (__strftime_l_compat, __strftime_l_compat_alias)
>+compat_symbol (libc, __strftime_l_compat_alias, __strftime_l, GLIBC_2_3);
>+compat_symbol (libc, __strftime_l_compat, strftime_l, GLIBC_2_3);
>+# endif
>+
> #endif
>diff --git a/time/wcsftime.c b/time/wcsftime.c
>index cbc4161..cf3371b 100644
>--- a/time/wcsftime.c
>+++ b/time/wcsftime.c
>@@ -17,12 +17,26 @@
> 
> #include <wchar.h>
> #include <locale/localeinfo.h>
>+#include <shlib-compat.h>
> 
> 
> size_t
>-wcsftime (wchar_t *s, size_t maxsize, const wchar_t *format,
>-	  const struct tm *tp)
>+__wcsftime (wchar_t *s, size_t maxsize, const wchar_t *format,
>+	    const struct tm *tp)
> {
>-  return __wcsftime_l (s, maxsize, format, tp, _NL_CURRENT_LOCALE);
>+  return __wcsftime_l_common (s, maxsize, format, tp, 1, _NL_CURRENT_LOCALE);
> }
>-libc_hidden_def (wcsftime)
>+versioned_symbol (libc, __wcsftime, wcsftime, GLIBC_2_26);
>+libc_hidden_ver (__wcsftime, wcsftime)
>+
>+
>+#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_26)
>+size_t
>+attribute_compat_text_section
>+__wcsftime_compat (wchar_t *s, size_t maxsize, const wchar_t *format,
>+		   const struct tm *tp)
>+{
>+  return __wcsftime_l_common (s, maxsize, format, tp, 0, _NL_CURRENT_LOCALE);
>+}
>+compat_symbol (libc, __wcsftime_compat, wcsftime, GLIBC_2_2);
>+#endif
>diff --git a/time/wcsftime_l.c b/time/wcsftime_l.c
>index 3210106..a748ccf 100644
>--- a/time/wcsftime_l.c
>+++ b/time/wcsftime_l.c
>@@ -22,4 +22,28 @@
> #define COMPILE_WIDE	1
> #include "strftime_l.c"
> 
>-weak_alias (__wcsftime_l, wcsftime_l)
>+size_t
>+__wcsftime_l_internal (wchar_t *s, size_t maxsize, const wchar_t *format,
>+		       const struct tm *tp, locale_t loc)
>+{
>+  return my_strftime (s, maxsize, format, tp, 1, loc);
>+}
>+strong_alias (__wcsftime_l_internal, __wcsftime_l_internal_alias)
>+versioned_symbol (libc, __wcsftime_l_internal_alias,
>+		  __wcsftime_l, GLIBC_2_26);
>+libc_hidden_ver (__wcsftime_l_internal_alias, __wcsftime_l)
>+versioned_symbol (libc, __wcsftime_l_internal, wcsftime_l, GLIBC_2_26);
>+libc_hidden_ver (__wcsftime_l_internal, wcsftime_l)
>+
>+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_26)
>+size_t
>+attribute_compat_text_section
>+__wcsftime_l_compat (wchar_t *s, size_t maxsize, const wchar_t *format,
>+		     const struct tm *tp, locale_t loc)
>+{
>+  return my_strftime (s, maxsize, format, tp, 0, loc);
>+}
>+strong_alias (__wcsftime_l_compat, __wcsftime_l_compat_alias)
>+compat_symbol (libc, __wcsftime_l_compat_alias, __wcsftime_l, GLIBC_2_3);
>+compat_symbol (libc, __wcsftime_l_compat, wcsftime_l, GLIBC_2_3);
>+#endif
>-- 
>2.7.5
>

Actions: View | Diff

Attachments on bug 10871: 8795 | 8874 | 8875 | 8876 | 8877 | 8878 | 8879 | 8880 | 9122 | 9123 | 9124 | 9125 | 9126 | 9127 | 9569 | 9570 | 9571 | 9572 | 9573 | 9574 | 9575 | 9576 | 9577 | 9578 | 9579 | 9595 | 9596 | 9597 | 9598 | 9599 | 9709 | 9710 | 9711 | 9712 | 9713 | 9714 | 9715 | 9716 | 9717 | 9718 | 9719 | 9720 | 9721 | 9908 | 9909 | 9910 | 9911 | 9912 | 9913 | 9914 | 9915 | 9916 | 9917 | 9918 | 9919 | 10063 | 10064 | 10065 | 10225 | 10226 | 10227 | 10228 | 10229 | 10230 | 10231 | 10425 | 10426 | 10427 | 10428 | 10429 | 10430 | 10592 | 10593 | 10594 | 10595 | 10596 | 10597 | 10598 | 10599 | 10600 | 10601 | 10602 | 10731 | 10732 | 10733 | 10734 | 10735 | 10736 | 10737 | 10738 | 10739 | 10740 | 10741 | 10742