From c4563d2d668675c2d5083f6ad01c801d6ccbe013 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 28 Apr 1999 23:13:52 +0000 Subject: Update. 1999-04-28 Ulrich Drepper * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization. --- time/getdate.c | 4 +- time/tzfile.c | 142 ++++++++++++++++++++++++++++++--------------------------- time/tzset.c | 8 ++-- 3 files changed, 80 insertions(+), 74 deletions(-) (limited to 'time') diff --git a/time/getdate.c b/time/getdate.c index c25a49d5a1..9957411fd8 100644 --- a/time/getdate.c +++ b/time/getdate.c @@ -1,5 +1,5 @@ /* Convert a string representation of time to a time value. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis , 1997. @@ -42,7 +42,7 @@ static int check_mday (int year, int mon, int mday); 8 invalid input specification Example: February 31 or a time is specified that can not be represented in a time_t (representing the time in seconds since 00:00:00 UTC, January 1, 1970) */ -int getdate_err = 0; +int getdate_err; /* Returns the first weekday WDAY of month MON in the year YEAR. */ diff --git a/time/tzfile.c b/time/tzfile.c index cfbdae6886..6681f9a66c 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -27,7 +27,7 @@ #define NOID #include -int __use_tzfile = 0; +int __use_tzfile; struct ttinfo { @@ -48,15 +48,15 @@ static struct ttinfo *find_transition (time_t timer) internal_function; static void compute_tzname_max (size_t) internal_function; static size_t num_transitions; -static time_t *transitions = NULL; -static unsigned char *type_idxs = NULL; +static time_t *transitions; +static unsigned char *type_idxs; static size_t num_types; -static struct ttinfo *types = NULL; -static char *zone_names = NULL; +static struct ttinfo *types; +static char *zone_names; static long int rule_stdoff; static long int rule_dstoff; static size_t num_leaps; -static struct leap *leaps = NULL; +static struct leap *leaps; #include #include @@ -84,7 +84,7 @@ decode (const void *ptr) } void -__tzfile_read (const char *file) +__tzfile_read (const char *file, size_t extra, char **extrap) { static const char default_tzdir[] = TZDIR; size_t num_isstd, num_isgmt; @@ -92,24 +92,15 @@ __tzfile_read (const char *file) struct tzhead tzhead; size_t chars; register size_t i; + size_t total_size; + size_t types_idx; + size_t leaps_idx; __use_tzfile = 0; if (transitions != NULL) free ((void *) transitions); transitions = NULL; - if (type_idxs != NULL) - free ((void *) type_idxs); - type_idxs = NULL; - if (types != NULL) - free ((void *) types); - types = NULL; - if (zone_names != NULL) - free ((void *) zone_names); - zone_names = NULL; - if (leaps != NULL) - free ((void *) leaps); - leaps = NULL; if (file == NULL) /* No user specification; use the site-wide default. */ @@ -151,7 +142,7 @@ __tzfile_read (const char *file) new = (char *) __alloca (tzdir_len + 1 + len); tmp = __mempcpy (new, tzdir, tzdir_len); *tmp++ = '/'; - __mempcpy (tmp, file, len); + memcpy (tmp, file, len); file = new; } @@ -169,41 +160,48 @@ __tzfile_read (const char *file) num_isstd = (size_t) decode (tzhead.tzh_ttisstdcnt); num_isgmt = (size_t) decode (tzhead.tzh_ttisgmtcnt); - if (num_transitions > 0) - { - transitions = (time_t *) malloc (num_transitions * sizeof (time_t)); - if (transitions == NULL) - goto lose; - type_idxs = (unsigned char *) malloc (num_transitions); - if (type_idxs == NULL) - goto lose; - } - if (num_types > 0) - { - types = (struct ttinfo *) malloc (num_types * sizeof (struct ttinfo)); - if (types == NULL) - goto lose; - } - if (chars > 0) + total_size = num_transitions * (sizeof (time_t) + 1); + total_size = ((total_size + __alignof__ (struct ttinfo) - 1) + & ~(__alignof__ (struct ttinfo) - 1)); + types_idx = total_size; + total_size += num_types * sizeof (struct ttinfo) + chars; + total_size = ((total_size + __alignof__ (struct leap) - 1) + & ~(__alignof__ (struct leap) - 1)); + leaps_idx = total_size; + total_size += num_leaps * sizeof (struct leap); + /* This is for the extra memory required by the caller. */ + total_size += extra; + + transitions = (time_t *) malloc (total_size); + if (transitions == NULL) + goto lose; + + type_idxs = (unsigned char *) transitions + (num_transitions + * sizeof (time_t)); + types = (struct ttinfo *) ((char *) transitions + types_idx); + zone_names = (char *) types + num_types * sizeof (struct ttinfo); + leaps = (struct leap *) ((char *) transitions + leaps_idx); + if (extra > 0) + *extrap = (char *) &leaps[num_leaps]; + + if (sizeof (time_t) < 4) + abort (); + + if (sizeof (time_t) == 4) { - zone_names = (char *) malloc (chars); - if (zone_names == NULL) + if (fread_unlocked (transitions, 1, (4 + 1) * num_transitions, f) + != (4 + 1) * num_transitions) goto lose; } - if (num_leaps > 0) + else { - leaps = (struct leap *) malloc (num_leaps * sizeof (struct leap)); - if (leaps == NULL) + if (fread_unlocked (transitions, 4, num_transitions, f) + != num_transitions + || fread_unlocked (type_idxs, 1, num_transitions, f) + != num_transitions) goto lose; } - if (sizeof (time_t) < 4) - abort (); - - if (fread_unlocked (transitions, 4, num_transitions, f) != num_transitions - || fread_unlocked (type_idxs, 1, num_transitions, f) != num_transitions) - goto lose; - /* Check for bogus indices in the data file, so we can hereafter safely use type_idxs[T] as indices into `types' and never crash. */ for (i = 0; i < num_transitions; ++i) @@ -224,14 +222,17 @@ __tzfile_read (const char *file) for (i = 0; i < num_types; ++i) { unsigned char x[4]; - if (fread_unlocked (x, 1, 4, f) != 4 - || fread_unlocked (&types[i].isdst, 1, 1, f) != 1 - || fread_unlocked (&types[i].idx, 1, 1, f) != 1) + int c; + if (fread_unlocked (x, 1, sizeof (x), f) != sizeof (x)) goto lose; - if (types[i].isdst > 1) + c = getc_unlocked (f); + if ((unsigned int) c > 1u) goto lose; - if (types[i].idx >= chars) /* Bogus index in data file. */ + types[i].isdst = c; + c = getc_unlocked (f); + if ((size_t) c > chars) /* Bogus index in data file. */ goto lose; + types[i].idx = c; types[i].offset = (long int) decode (x); } @@ -354,10 +355,13 @@ void __tzfile_default (const char *std, const char *dst, long int stdoff, long int dstoff) { - size_t stdlen, dstlen, i; + size_t stdlen = strlen (std) + 1; + size_t dstlen = strlen (dst) + 1; + size_t i; int isdst; + char *cp; - __tzfile_read (TZDEFRULES); + __tzfile_read (TZDEFRULES, stdlen + dstlen, &cp); if (!__use_tzfile) return; @@ -367,19 +371,10 @@ __tzfile_default (const char *std, const char *dst, return; } - /* Ignore the zone names read from the file. */ - free (zone_names); - - /* Use the names the user specified. */ - stdlen = strlen (std) + 1; - dstlen = strlen (dst) + 1; - zone_names = malloc (stdlen + dstlen); - if (zone_names == NULL) - { - __use_tzfile = 0; - return; - } - __mempcpy (__mempcpy (zone_names, std, stdlen), dst, dstlen); + /* Ignore the zone names read from the file and use the given ones + instead. */ + __mempcpy (__mempcpy (cp, std, stdlen), dst, dstlen); + zone_names = cp; /* Now there are only two zones, regardless of what the file contained. */ num_types = 2; @@ -554,3 +549,14 @@ compute_tzname_max (size_t chars) } while (++p < &zone_names[chars]); } + +/* This function is only called when we are checking for memory leaks. */ +static void +freeres (void) +{ + if (transitions != NULL) + free ((void *) transitions); +} + +/* Make sure all allocated data is freed before exiting. */ +text_set_element (__libc_subfreeres, freeres); diff --git a/time/tzset.c b/time/tzset.c index d6d1b2089a..24624fa188 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -121,7 +121,7 @@ __tzstring (const char *s) return new->data; } -static char *old_tz = NULL; +static char *old_tz; /* Interpret the TZ envariable. */ static void @@ -129,7 +129,7 @@ internal_function tzset_internal (always) int always; { - static int is_initialized = 0; + static int is_initialized; register const char *tz; register size_t l; char *tzbuf; @@ -169,7 +169,7 @@ tzset_internal (always) old_tz = tz ? __strdup (tz) : NULL; /* Try to read a data file. */ - __tzfile_read (tz); + __tzfile_read (tz, 0, NULL); if (__use_tzfile) return; -- cgit v1.2.3