diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/etags.c | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 098ee06c762..c2b1b106c15 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-05 Paul Eggert <eggert@cs.ucla.edu> + + Assume support for memcmp, memcpy, memmove, memset. + * etags.c (absolute_filename): Assume memmove exists. + 2011-07-02 Jason Rumney <jasonr@gnu.org> * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on diff --git a/lib-src/etags.c b/lib-src/etags.c index 693c999047f..bba4b8e7267 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -6567,22 +6567,13 @@ absolute_filename (char *file, char *dir) else if (cp[0] != '/') cp = slashp; #endif -#ifdef HAVE_MEMMOVE memmove (cp, slashp + 3, strlen (slashp + 2)); -#else - /* Overlapping copy isn't really okay */ - strcpy (cp, slashp + 3); -#endif slashp = cp; continue; } else if (slashp[2] == '/' || slashp[2] == '\0') { -#ifdef HAVE_MEMMOVE memmove (slashp, slashp + 2, strlen (slashp + 1)); -#else - strcpy (slashp, slashp + 2); -#endif continue; } } |