aboutsummaryrefslogtreecommitdiff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-09-22 03:06:42 +0000
committerUlrich Drepper <drepper@redhat.com>1996-09-22 03:06:42 +0000
commit845dcb57b1de1b8c2ea88cd101d6e5a80181ee4e (patch)
treec13a286fe36773fc4d7d34af8527956a6ec8838b /locale/setlocale.c
parentdaf2bb515bdd8212c8d95b78e70ef02f035304c5 (diff)
downloadglibc-845dcb57b1de1b8c2ea88cd101d6e5a80181ee4e.zip
glibc-845dcb57b1de1b8c2ea88cd101d6e5a80181ee4e.tar.gz
glibc-845dcb57b1de1b8c2ea88cd101d6e5a80181ee4e.tar.bz2
update from main archive 960921
Sun Sep 22 03:40:52 1996 Ulrich Drepper <drepper@cygnus.com> * resolv/resolv.h: Update to bind-4.9.5-T4B. * resolv/base64.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/res_query.c: Likewise. * resolv/gethnamaddr.c: Likewise. * nss/nss_dns/dns-host.c: Likewise. * resolv/res_comp.c: Likewise. * resolv/res_send.c: Likewise. * resolv/arpa/nameser.h: Likewise. Attention: MAXDNAME is much higher now. * resolv/Banner: New file. * resolv/Makefile (distribute): Add Banner. Sat Sep 21 19:15:24 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/stub/getsysstats.c: New file. * sysdeps/unix/sysv/linux/getsysstats.c: New file. * misc/Makefile (headers): Add sys/sysinfo.h. (routines): Add getsysstats. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==misc] (sysdep_headers): Remove sys/sysinfo.h. * sysdeps/generic/sys/sysinfo.h: New file. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Add prototype for get_nprocs, get_phys_pages, and get_avphys_pages. * misc/Makefile (routines): Add mntent_r. * misc/mntent_r.c: New file. * misc/mntent.c: Remove all functions but getmntent and use __getmntent_r. * misc/mntent.h: Add prototype for __getmntent_r. * misc/fstab.c: Use __getmntent_r function instead of getmntent. This will not clobber the state in getmntent. * sysdeps/generic/confname.h: Add _SC_PROCESSORS_CONF, _SC_NPROCESSORS_ONLN, _SC_PHYS_PAGES, _SC_AVPHYS_PAGES, _SC_ATEXIT_MAX, and _SC_PASS_MAX. * sysdeps/stub/sysconf.c: Add handling _SC_PROCESSORS_CONF and _SC_NPROCESSORS_ONLN by calling __get_nprocs, _SC_PHYS_PAGES by calling __get_phys_pages, _SY_AVPHYS_PAGES by calling __get_avphys_pages, _SC_ATEXIT_MAX and _SC_PASS_MAX. * sysdeps/posix/sysconf.c: Likewise. * posix/getconf.c (vars): Add _NPROCESSORS_CONF, _NPROCESSORS_ONLN, _PHYS_PAGES, _AVPHYS_PAGES, ATEXIT_MAX, and PASS_MAX entries. Sat Sep 21 05:20:36 1996 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 1.95. * Make-dist (+tsrcs): Don't filter out files in subdirs which match files in the sysdeps hierachy (welcome back, sys/syscall.h!). * resolv/Makefile (libresolv-routines): Remove getnetnamad. Sat Sep 21 03:00:19 1996 Ulrich Drepper <drepper@cygnus.com> * locale/loadlocale.c (_nl_free_locale): Remove function. * locale/localeinfo.h: Remove prototype for _nl_free_locale. * locale/setlocale.c (setlocale): Don't free locale data of categories which succeeded to load after a wrong or missing data file was observed. * locale/setlocale (setlocale): Initialize NEWNAME correctly so that it works even when the locale data is not used. * stdlib/random_r.c: Fix typo in comment. * stdlib/drand48-iter.c: Likewise. * stdlib/drand48.c: Likewise. * stdlib/erand48.c: Likewise. * stdlib/jrand48.c: Likewise. * stdlib/lcong48.c: Likewise. * stdlib/lrand48.c: Likewise. * stdlib/mrand48.c: Likewise. * stdlib/nrand48.c: Likewise. * stdlib/random.c: Likewise. * stdlib/seed48.c: Likewise. * stdlib/srand48.c: Likewise. * misc/search.h: Likewise. * misc/hsearch.c: Likewise. * misc/hsearch_r.c: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S (__errno_location): Thu Sep 19 23:36:19 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/hurdinit.c (__libc_argv): Provide common decl. (_hurd_setproc): Don't declare __libc_argv here.
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c44
1 files changed, 9 insertions, 35 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 4eeb5b3..d0d9223 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -326,40 +326,22 @@ setlocale (int category, const char *locale)
&newnames[category]);
if (newdata[category] == NULL)
- goto abort_composite;
+ break;
}
else
{
/* The data is never used; just change the name. */
newnames[category] = clever_copy (newnames[category]);
if (newnames[category] == NULL)
- goto abort_composite;
+ break;
}
/* Create new composite name. */
- composite = new_composite_name (LC_ALL, newnames);
- if (composite == NULL)
- {
- /* Loading this part of the locale failed. Abort the
- composite load. */
- int save_errno;
-
- category = -1;
- abort_composite:
- save_errno = errno;
-
- while (++category < LC_ALL)
- if (_nl_current[category] != NULL
- && newdata[category] != _nl_C[category])
- _nl_free_locale (newdata[category]);
- else
- if (_nl_current[category] == NULL
- && newnames[category] != _nl_C_name)
- free (newnames[category]);
-
- errno = save_errno;
- composite = NULL;
- }
+ if (category >= 0
+ || (composite = new_composite_name (LC_ALL, newnames)) == NULL)
+ /* Loading this part of the locale failed. Abort the
+ composite load. */
+ composite = NULL;
else
{
/* Now we have loaded all the new data. Put it in place. */
@@ -379,7 +361,7 @@ setlocale (int category, const char *locale)
else
{
const struct locale_data *newdata = NULL;
- char *newname = NULL;
+ char *newname = (char *) locale;
/* Protect global data. */
__libc_lock_lock (lock);
@@ -387,7 +369,6 @@ setlocale (int category, const char *locale)
if (_nl_current[category] != NULL)
{
/* Only actually load the data if anything will use it. */
- newname = (char *) locale;
newdata = _nl_find_locale (locale_path, locale_path_len, category,
(char **) &newname);
if (newdata == NULL)
@@ -398,14 +379,7 @@ setlocale (int category, const char *locale)
composite = new_composite_name (category, &newname);
if (composite == NULL)
{
- /* If anything went wrong free what we managed to allocate
- so far. */
- int save_errno = errno;
-
- if (_nl_current[category] != NULL)
- _nl_free_locale (newdata);
-
- errno = save_errno;
+ /* Say that we don't have any data loaded. */
abort_single:
newname = NULL;
}