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. --- io/ftw.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'io') diff --git a/io/ftw.c b/io/ftw.c index e0835c2839..a7b537f446 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -186,9 +186,9 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp) buf = newp; } - memcpy (buf + actsize, d->d_name, this_len); - actsize += this_len; - buf[actsize++] = '\0'; + *((char *) __mempcpy (buf + actsize, d->d_name, this_len)) + = '\0'; + actsize += this_len + 1; } /* Terminate the list with an additional NUL byte. */ @@ -259,8 +259,7 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, data->dirbuf = newp; } - memcpy (data->dirbuf + data->ftw.base, name, namlen); - data->dirbuf[data->ftw.base + namlen] = '\0'; + *((char *) __mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0'; if (((data->flags & FTW_PHYS) ? LXSTAT (_STAT_VER, data->dirbuf, &st) -- cgit 1.4.1