Attachment 10231 Details for Bug 10871 – Backward compatibility for abbreviated alternative month names and %Ob (version 8)

[patch] Backward compatibility for abbreviated alternative month names and %Ob (version 8)

0010-Backward-compatibility-for-abbreviated-alt.-names-bu.patch (text/plain), 2.53 KB, created by Rafal Luzynski on 2017-06-28 00:39:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafal Luzynski

Created: 2017-06-28 00:39:31 UTC

Size: 2.53 KB

patch

obsolete

>From dfcb2477290033116dd8482d3d7edc96bbecab8a Mon Sep 17 00:00:00 2001
>From: Rafal Luzynski <digitalfreak@lingonborough.com>
>Date: Sat, 21 Jan 2017 21:30:50 +0100
>Subject: [PATCH 10/16] Backward compatibility for abbreviated alt. names (bug
> 10871).
>
>All the previous changes related with backward compatibility also
>repeated to support abbreviated alternative month names.
>
>[BZ #10871]
>* locale/nl_langinfo_l.c: backward compatibility for _NL_[W]ABALTMON.
>* time/strftime_l.c: backward compatibility for %Ob.
>---
> locale/nl_langinfo_l.c | 14 +++++++++++++-
> time/strftime_l.c      |  4 +++-
> 2 files changed, 16 insertions(+), 2 deletions(-)
>
>diff --git a/locale/nl_langinfo_l.c b/locale/nl_langinfo_l.c
>index efb3ca0..e0de72b 100644
>--- a/locale/nl_langinfo_l.c
>+++ b/locale/nl_langinfo_l.c
>@@ -81,7 +81,9 @@ attribute_compat_text_section
> __nl_langinfo_noaltmon_l (nl_item item, locale_t l)
> {
>   if ((item >= ALTMON_1 && item <= ALTMON_12)
>-      || (item >= _NL_WALTMON_1 && item <= _NL_WALTMON_12))
>+      || (item >= _NL_WALTMON_1 && item <= _NL_WALTMON_12)
>+      || (item >= _NL_ABALTMON_1 && item <= _NL_ABALTMON_12)
>+      || (item >= _NL_WABALTMON_1 && item <= _NL_WABALTMON_12))
>     /* Pretend it's a bogus index for this category: bogus item.  */
>     return (char *) "";
>   else if (item >= MON_1 && item <= MON_12)
>@@ -94,6 +96,16 @@ __nl_langinfo_noaltmon_l (nl_item item, locale_t l)
>       /* The same for _NL_WALTMON_... and _NL_WMON_...  */
>       return __nl_langinfo_l (item + _NL_WALTMON_1 - _NL_WMON_1, l);
>     }
>+  else if (item >= ABMON_1 && item <= ABMON_12)
>+    {
>+      /* _NL_ABALTMON... item contains what ABMON_... item contained before.  */
>+      return __nl_langinfo_l (item + _NL_ABALTMON_1 - ABMON_1, l);
>+    }
>+  else if (item >= _NL_WABMON_1 && item <= _NL_WABMON_12)
>+    {
>+      /* The same for _NL_WABALTMON_... and _NL_WABMON_...  */
>+      return __nl_langinfo_l (item + _NL_WABALTMON_1 - _NL_WABMON_1, l);
>+    }
> 
>   /* Default result if it is not a month.  */
>   return __nl_langinfo_l (item, l);
>diff --git a/time/strftime_l.c b/time/strftime_l.c
>index 203bb9e..c9e1737 100644
>--- a/time/strftime_l.c
>+++ b/time/strftime_l.c
>@@ -797,8 +797,10 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
> 	    }
> 	  if (modifier == L_('E'))
> 	    goto bad_format;
>+	  if (!feature_OB && modifier == L_('O'))
>+	    goto bad_format;
> #if defined _NL_CURRENT || !HAVE_STRFTIME
>-	  if (modifier == L_('O'))
>+	  if (!feature_OB || modifier == L_('O'))
> 	    cpy (aam_len, a_altmonth);
> 	  else
> 	    cpy (am_len, a_month);
>-- 
>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