From 679e4c434f755644cc2093c9940ac58d0c2b51cf Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 11 Oct 2002 07:22:18 +0000 Subject: * locale/newlocale.c (__newlocale): If setting all categories to "C", just return &_nl_C_locobj instead of copying it. * locale/freelocale.c (__freelocale): Check for &_nl_C_locobj. * locale/duplocale.c (__duplocale): Likewise. 2002-10-07 Roland McGrath * config.h.in (HAVE_I386_SET_GDT): New #undef. * sysdeps/mach/configure.in: Define it with new check for i386_set_gdt. * sysdeps/mach/configure: Regenerated. 2002-10-06 Franz Sirl * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (INLINE_SYSCALL): Add all necessary register outputs for syscall-clobbered registers. 2002-10-02 David Mosberger * sysdeps/ia64/bzero.S: Rewritten by Sverre Jarp to tune for Itanium 2 (and Itanium). Fix unwind directives and make it fit in 80 columns. * sysdeps/ia64/memset.S: Ditto. * sysdeps/ia64/memcpy.S: Ditto. Move jump table to .rodata section. 2002-10-03 Roland McGrath * sysdeps/mach/hurd/i386/init-first.c (_hurd_stack_setup): Add clobbers to asm. --- locale/newlocale.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'locale/newlocale.c') diff --git a/locale/newlocale.c b/locale/newlocale.c index 3b8676ceeb..1131f62c0b 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -60,6 +60,17 @@ __newlocale (int category_mask, const char *locale, __locale_t base) if (locale == NULL) ERROR_RETURN; + if (base == &_nl_C_locobj) + /* We're to modify BASE, returned for a previous call with "C". + We can't really modify the read-only structure, so instead + start over by copying it. */ + base = NULL; + + if ((base == NULL || category_mask == (1 << __LC_LAST) - 1 - (1 << LC_ALL)) + && (category_mask == 0 || !strcmp (locale, "C"))) + /* Asking for the "C" locale needn't allocate a new object. */ + return &_nl_C_locobj; + /* Allocate memory for the result. */ if (base != NULL) result = *base; -- cgit 1.4.1