- (bal) bsd-getcwd.c and bsd-setenv.c changed from bcopy() to memmove()

diff --git a/ChangeLog b/ChangeLog
index 71350188f979d5708cc518dad168d00015892a88..8d6bea18e1137b9444e37926276e590a20bc381a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20010105
  - (bal) contrib/caldera/ provided by Tim Rice <tim@multitalents.net>
+ - (bal) bsd-getcwd.c and bsd-setenv.c changed from bcopy() to memmove()
 
 20010104
  - (djm) Fix memory leak on systems with BROKEN_GETADDRINFO. Based on

diff --git a/bsd-getcwd.c b/bsd-getcwd.c
index cca4177877a7101f75c96a02a44c5def4f5ca738..273a0487cda988ff8b8d5e3d271e928cd250be0a 100644 (file)
--- a/bsd-getcwd.c
+++ b/bsd-getcwd.c
@@ -119,7 +119,7 @@ getcwd(char *pt,size_t size)
                         * path to the beginning of the buffer, but it's always
                         * been that way and stuff would probably break.
                         */
-                       bcopy(bpt, pt, ept - bpt);
+                       memmove(bpt, pt, ept - bpt);
                        free(up);
                        return (pt);
                }
@@ -170,7 +170,7 @@ getcwd(char *pt,size_t size)
                                        goto notfound;
                                if (ISDOT(dp))
                                        continue;
-                               bcopy(dp->d_name, bup, dp->d_namlen + 1);
+                               memmove(dp->d_name, bup, dp->d_namlen + 1);
 
                                /* Save the first error for later. */
                                if (lstat(up, &s)) {
@@ -202,13 +202,13 @@ getcwd(char *pt,size_t size)
                        pt = npt;
                        bpt = pt + off;
                        ept = pt + ptsize;
-                       bcopy(bpt, ept - len, len);
+                       memmove(bpt, ept - len, len);
                        bpt = ept - len;
                }
                if (!first)
                        *--bpt = '/';
                bpt -= dp->d_namlen;
-               bcopy(dp->d_name, bpt, dp->d_namlen);
+               memmove(dp->d_name, bpt, dp->d_namlen);
                (void)closedir(dir);
 
                /* Truncate any file name. */

diff --git a/bsd-setenv.c b/bsd-setenv.c
index f5dbd277048ca57b572b03f011654593a7868112..d69f88258b81c6f0ecaad1bc7d40fef2d9818425 100644 (file)
--- a/bsd-setenv.c
+++ b/bsd-setenv.c
@@ -122,7 +122,7 @@ setenv(name, value, rewrite)
                            (cnt + 2)));
                        if (!P)
                                return (-1);
-                       bcopy(environ, P, cnt * sizeof(char *));
+                       memmove(environ, P, cnt * sizeof(char *));
                        environ = P;
                }
                environ[cnt + 1] = NULL;