From 86187531d302de284b67ac162cf76c60c86bd7da Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 6 Nov 1997 00:02:46 +0000 Subject: Update. 1997-11-06 00:06 Ulrich Drepper * argp/argp-help.c: Optimize a bit by using mempcpy. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * inet/rcmd.c: Likewise. * io/ftw.c: Likewise. * libio/fileops.c: Likewise. * libio/genops.c: Likewise. * libio/obprintf.c: Likewise. * nss/nsswitch.c: Likewise. * posix/execvp.c: Likewise. * posix/getopt.c: Likewise. * posix/glob.c: Likewise. * posix/wordexp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * string/argz-replace.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/writev.c: Likewise. * time/strftime.c: Likewise. * time/tzfile.c: Likewise. * login/utmp_daemon.c: Use memcpy instead of strcpy where possible. * sunrpc/svcauth_des.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * misc/tsearch.c: Use memcpy return value if possible. * posix/regex.c: Likewise. * sysdeps/unix/readdir_r.c: Likewise. * wcsmbc/wcsdup.c: Likewise. * nss/digits_dots.c: Little optimization. * inet/ruserpass.c (ruserpass): Optimize by using stpcpy. (struct toktab): Make tokstr field a const char *. * elf/dl-profile.c: Fix typo. * inet/ether_ntoh.c: Don't use relative #include path. * inet/gethstbynm.c: Likewise. * resolv/inet_pton.c: Likewise. * shadow/sgetspent_r.c: Likewise. * libio/oldfileops.c (_IO_old_file_jumps): Use correct sync and write callbacks. Patch by NIIBE Yutaka . * posix/confstr.c: Correct string for _CS_LFS_CFLAGS. Handle _CS_XBS5_* constants. * posix/unistd.h: Add comment describing _XBS5_* constants. * sysdeps/generic/bits/confname.h: Add _CS_XBS5_* constants. * posix/regex.c: Indent preprocessor code. * posix/wordexp.c: Using _itoa_word instead of sprintf. * stdlib/canonicalize.c: Avoid unnecessary copying. Handle NULL and "" arguments correctly according to SUS. * stdlib/test-canon.c: Test "" and NULL argument handling. * sysdeps/posix/writev.c: Correct condition to leave the loop. 1997-11-05 18:13 Ulrich Drepper * nss/getXXbyYY.c: Set buffer to NULL if realloc fails so that possible next call starts with malloc again. Proposed by Joe Keane . 1997-11-04 23:57 Ulrich Drepper * configure.in: Correct gcc -pipe test. Patch by Zack Weinberg . * posix/glob.c: Cleanups. Patch by H.J. Lu . 1997-11-04 Andreas Jaeger * manual/creature.texi (Feature Test Macros): Add _POSIX_C_SOURCE definition. --- time/tzfile.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'time/tzfile.c') diff --git a/time/tzfile.c b/time/tzfile.c index e3cb299fe1..3d2d3e0485 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -134,7 +134,7 @@ __tzfile_read (const char *file) { const char *tzdir; unsigned int len, tzdir_len; - char *new; + char *new, *tmp; tzdir = __secure_getenv ("TZDIR"); if (tzdir == NULL || *tzdir == '\0') @@ -146,9 +146,9 @@ __tzfile_read (const char *file) tzdir_len = strlen (tzdir); len = strlen (file) + 1; new = (char *) __alloca (tzdir_len + 1 + len); - memcpy (new, tzdir, tzdir_len); - new[tzdir_len] = '/'; - memcpy (&new[tzdir_len + 1], file, len); + tmp = __mempcpy (new, tzdir, tzdir_len); + *tmp++ = '/'; + __mempcpy (tmp, file, len); file = new; } @@ -316,8 +316,7 @@ __tzfile_default (const char *std, const char *dst, __use_tzfile = 0; return; } - memcpy (zone_names, std, stdlen); - memcpy (&zone_names[stdlen], dst, dstlen); + __mempcpy (__mempcpy (zone_names, std, stdlen), dst, dstlen); /* Find the standard and daylight time offsets used by the rule file. We choose the offsets in the types of each flavor that are -- cgit v1.2.3