fix nl_langinfo with static linking
diff mbox

Message ID 1399385072-5600-1-git-send-email-aurelien@aurel32.net
State New
Headers show

Commit Message

Aurelien Jarno May 6, 2014, 2:04 p.m. UTC
For static linking the locale code avoids linking code and data for
unused categories. However for nl_langinfo we know only at runtime which
categories are used, so direct reference to every nl_current_CATEGORY
symbol should be done.

This was broken by commit bc3e1c127392da88d0c8bf2ae728147982a3d1bc where
nl_langinfo_l and nl_langinfo have been merged and some code has been
lost in the process.

In order to detect locales issues with static linking, compile a version
of tst-langinfo with static linking.

Note: this is Debian bug#747103 reported by Raphael <raphael.astier@eliot-sa.com>
---
 ChangeLog                        | 12 ++++++++++++
 locale/nl_langinfo_l.c           | 14 ++++++++++++++
 localedata/Makefile              | 13 ++++++++++---
 localedata/tst-langinfo-static.c |  1 +
 localedata/tst-langinfo.sh       |  3 +--
 5 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 localedata/tst-langinfo-static.c

Comments

Roland McGrath May 6, 2014, 7:56 p.m. UTC | #1
As a user-visible issue this should have a bugzilla report and BZ# tag in
the log entry.
Roland McGrath May 6, 2014, 9:04 p.m. UTC | #2
> +	($(objpfx)tst-langinfo.out): Redirect output.

Mention use of $(evaluate-test) too.

> +    default:                   /* Should be impossible.  */
> +      return (char *) "";

Make this an assert or abort rather than having the library function return
the user error indication for a case that is an implementation bug.

Otherwise looks fine to me (with BZ# added).


Thanks,
Roland
Aurelien Jarno May 6, 2014, 9:10 p.m. UTC | #3
On Tue, May 06, 2014 at 02:04:15PM -0700, Roland McGrath wrote:
> > +	($(objpfx)tst-langinfo.out): Redirect output.
> 
> Mention use of $(evaluate-test) too.

$(evaluate-test) is not something new for tst-langinfo.out, it appears
there because the way the diff is done by git.

> > +    default:                   /* Should be impossible.  */
> > +      return (char *) "";
> 
> Make this an assert or abort rather than having the library function return
> the user error indication for a case that is an implementation bug.
> 
> Otherwise looks fine to me (with BZ# added).

Ok, thanks for the review.
Roland McGrath May 6, 2014, 9:28 p.m. UTC | #4
> $(evaluate-test) is not something new for tst-langinfo.out, it appears
> there because the way the diff is done by git.

Fair enough.
Ondřej Bílka May 13, 2014, 8:12 p.m. UTC | #5
On Tue, May 06, 2014 at 04:04:32PM +0200, Aurelien Jarno wrote:
> For static linking the locale code avoids linking code and data for
> unused categories. However for nl_langinfo we know only at runtime which
> categories are used, so direct reference to every nl_current_CATEGORY
> symbol should be done.
> 
> This was broken by commit bc3e1c127392da88d0c8bf2ae728147982a3d1bc where
> nl_langinfo_l and nl_langinfo have been merged and some code has been
> lost in the process.
> 
> In order to detect locales issues with static linking, compile a version
> of tst-langinfo with static linking.
> 
> Note: this is Debian bug#747103 reported by Raphael <raphael.astier@eliot-sa.com>

Partialy reverts a commit bc3e1c127392da88d0c8bf2ae728147982a3d1bc,
looks ok for me.

Patch
diff mbox

diff --git a/ChangeLog b/ChangeLog
index e7ad09a..db2c1fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@ 
 2014-05-06  Aurelien Jarno  <aurelien@aurel32.net>
 
+	* locale/nl_langinfo_l.c: Make direct reference to every
+	_nl_current_CATEGORY symbol.
+	* localedata/Makefile (test-srcs): Add tst-langinfo-static.
+	(tests-static): Add tst-langinfo-static.
+	(tests-special): Add tst-langinfo-static.out.
+	($(objpfx)tst-langinfo.out): Redirect output.
+	($(objpfx)tst-langinfo-static.out): New.
+	* localedata/tst-langinfo.sh: Send output to stdout.
+	* localedata/tst-langinfo-static.c: New file.
+
+2014-05-06  Aurelien Jarno  <aurelien@aurel32.net>
+
 	* sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal): return
 	errno if the TIOCGPTN ioctl fails with an error different than
 	EINVAL.
diff --git a/locale/nl_langinfo_l.c b/locale/nl_langinfo_l.c
index b9d02aa..371df65 100644
--- a/locale/nl_langinfo_l.c
+++ b/locale/nl_langinfo_l.c
@@ -43,7 +43,21 @@  __nl_langinfo_l (item, l)
   if (index == _NL_ITEM_INDEX (_NL_LOCALE_NAME (category)))
     return (char *) l->__names[category];
 
+#if defined NL_CURRENT_INDIRECT
+  /* Make direct reference to every _nl_current_CATEGORY symbol,
+     since we know only at runtime which categories are used.  */
+  switch (category)
+    {
+# define DEFINE_CATEGORY(category, category_name, items, a) \
+      case category: data = *_nl_current_##category; break;
+# include "categories.def"
+# undef DEFINE_CATEGORY
+    default:                   /* Should be impossible.  */
+      return (char *) "";
+    }
+#else
   data = l->__locales[category];
+#endif
 
   if (index >= data->nstrings)
     /* Bogus index for this category: bogus item.  */
diff --git a/localedata/Makefile b/localedata/Makefile
index 94562be..48ec3de 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -35,7 +35,7 @@  vpath %.h tests-mbwc
 
 test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
 	     tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
-	     tst-ctype tst-wctype tst-langinfo tst-numeric
+	     tst-ctype tst-wctype tst-langinfo tst-langinfo-static tst-numeric
 test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
 	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
 	      si_LK.UTF-8
@@ -95,7 +95,9 @@  tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \
 		 $(objpfx)tst-locale.out $(objpfx)tst-rpmatch.out \
 		 $(objpfx)tst-trans.out $(objpfx)tst-mbswcs.out \
 		 $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \
-		 $(objpfx)tst-langinfo.out $(objpfx)tst-numeric.out
+		 $(objpfx)tst-langinfo.out $(objpfx)tst-langinfo-static.out \
+		 $(objpfx)tst-numeric.out
+tests-static += tst-langinfo-static
 
 ifeq ($(run-built-tests),yes)
 # We have to generate locales
@@ -197,7 +199,12 @@  $(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
 $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
 			$(objpfx)sort-test.out \
 			$(addprefix $(objpfx),$(CTYPE_FILES))
-	$(SHELL) $< $(common-objpfx) '$(test-program-cmd)'; \
+	$(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@; \
+	$(evaluate-test)
+$(objpfx)tst-langinfo-static.out: tst-langinfo.sh $(objpfx)tst-langinfo-static \
+			$(objpfx)sort-test.out \
+			$(addprefix $(objpfx),$(CTYPE_FILES))
+	$(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@; \
 	$(evaluate-test)
 $(objpfx)tst-digits.out: $(objpfx)tst-locale.out
 $(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
diff --git a/localedata/tst-langinfo-static.c b/localedata/tst-langinfo-static.c
new file mode 100644
index 0000000..46856a0
--- /dev/null
+++ b/localedata/tst-langinfo-static.c
@@ -0,0 +1 @@ 
+#include "tst-langinfo.c"
diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh
index e75d22a..bd489d0 100755
--- a/localedata/tst-langinfo.sh
+++ b/localedata/tst-langinfo.sh
@@ -340,7 +340,6 @@  ja_JP.EUC-JP         NOEXPR      ^([nN
 ja_JP.EUC-JP         CODESET     EUC-JP
 EOF
 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-LC_ALL=tt_TT ${tst_langinfo} \
-    > ${common_objpfx}localedata/tst-langinfo.out
+LC_ALL=tt_TT ${tst_langinfo}
 
 exit $?