From db2f05ba83cd9eaae24b30166816e5169bbae2c0 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 25 Mar 2004 03:54:03 +0000 Subject: * Makerules ($(common-objpfx)shlib.lds): Don't use \n in rhs of sed substitutions; the semicolon terminators are enough for ld anyway. * elf/dl-deps.c (_dl_map_object_deps): Use alloca instead of dynamically sized auto array in function already using alloca. * locale/programs/ld-ctype.c (ctype_output): Likewise. * locale/programs/ld-time.c (time_output): Likewise. * elf/dl-misc.c (_dl_debug_vdprintf): Use macro instead of const for IOV array size. * locale/programs/charmap.c (charmap_read): Avoid alloca (or strdupa) when also using dynamically-sized auto array. * locale/programs/locfile.c (locfile_read): Likewise. * locale/programs/repertoire.c (repertoire_read): Likewise. * nis/nis_print_group_entry.c (nis_print_group_entry): Likewise. * locale/programs/locarchive.c (enlarge_archive): Likewise. * posix/annexc.c (check_header): Likewise. * iconv/gconv_int.h (norm_add_slashes): Don't handle null SUFFIX. strlen ("") gets optimized away just as well. * intl/loadmsgcat.c (_nl_init_domain_conv): Update caller. * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Likewise. --- locale/programs/charmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'locale/programs/charmap.c') diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index 8c9e4e9abb..8dbac6f5b9 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1998-2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1998-2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -106,9 +106,11 @@ charmap_read (const char *filename, int verbose, int be_quiet, int use_default) char *i18npath = getenv ("I18NPATH"); if (i18npath != NULL && *i18npath != '\0') { - char path[strlen (i18npath) + sizeof ("/charmaps")]; + const size_t pathlen = strlen (i18npath); + char i18npathbuf[pathlen + 1]; + char path[pathlen + sizeof ("/charmaps")]; char *next; - i18npath = strdupa (i18npath); + i18npath = memcpy (i18npathbuf, i18npath, pathlen + 1); while (cmfile == NULL && (next = strsep (&i18npath, ":")) != NULL) -- cgit v1.2.3