[Emacs-diffs] emacs/lib-src ChangeLog etags.c

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/11/23 09:51:07

Modified files:
        lib-src        : ChangeLog etags.c 

Log message:
        * etags.c (absolute_filename): Use memove if we have it for overlapping 
copy.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/ChangeLog?cvsroot=emacs&r1=2.547&r2=2.548
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/etags.c?cvsroot=emacs&r1=3.92&r2=3.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/ChangeLog,v
retrieving revision 2.547
retrieving revision 2.548
diff -u -b -r2.547 -r2.548
--- ChangeLog   4 Nov 2009 06:15:41 -0000       2.547
+++ ChangeLog   23 Nov 2009 09:51:06 -0000      2.548
@@ -1,3 +1,8 @@
+2009-11-23  Tobias Ringström  <address@hidden> (tiny change)
+
+       * etags.c (absolute_filename): Use memove if we have it for
+       overlapping copy.
+
 2009-11-04  Dan Nicolaescu  <address@hidden>
 
        * make-docfile.c (scan_lisp_file): Also look for `defvaralias'.

Index: etags.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/etags.c,v
retrieving revision 3.92
retrieving revision 3.93
diff -u -b -r3.92 -r3.93
--- etags.c     5 Jan 2009 00:52:30 -0000       3.92
+++ etags.c     23 Nov 2009 09:51:06 -0000      3.93
@@ -6695,13 +6695,22 @@
              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;
            }
        }