From 74955460c5b9f23d7783395ce2478f5b7c5fd876 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 26 Sep 2000 09:46:55 +0000 Subject: Update. 2000-09-26 Thorsten Kukuk * nscd/dbg_log.c (dbg_log): Add missing format string. * catgets/catgets.c (catopen): Use getenv instead of __secure_getenv since we filter out the variable once. * iconv/gconv_conf.c (__gconv_get_path): Likewise. * locale/newlocale.c (__newlocale): Likewise. * locale/setlocale.c (setlocale): Likewise. * malloc/malloc.c (ptmalloc_init): Likewise. * resolv/res_hconf.c (_res_hconf_init): Likewise. * resolv/res_init.c (__res_vinit): Likewise. * time/tzfile.c (__tzfile_read): Likewise. * sysdeps/generic/unsecvars.h: New file. * elf/dl-support.c (non_dynamic_init): Use it here to remove variables. * elf/rtld.c (process_envvars): Likewise. * elf/Makefile (distribute): Add unsecvars.h. --- locale/newlocale.c | 2 +- locale/setlocale.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'locale') diff --git a/locale/newlocale.c b/locale/newlocale.c index 5c0d7ba46a..cd40943ccc 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -91,7 +91,7 @@ __newlocale (int category_mask, const char *locale, __locale_t base) locale_path = NULL; locale_path_len = 0; - locpath_var = __secure_getenv ("LOCPATH"); + locpath_var = getenv ("LOCPATH"); if (locpath_var != NULL && locpath_var[0] != '\0') if (__argz_create_sep (locpath_var, ':', &locale_path, &locale_path_len) != 0) diff --git a/locale/setlocale.c b/locale/setlocale.c index 03456fba71..c3e5066c35 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -239,7 +239,7 @@ setlocale (int category, const char *locale) locale_path = NULL; locale_path_len = 0; - locpath_var = __secure_getenv ("LOCPATH"); + locpath_var = getenv ("LOCPATH"); if (locpath_var != NULL && locpath_var[0] != '\0') if (__argz_create_sep (locpath_var, ':', &locale_path, &locale_path_len) != 0) -- cgit 1.4.1