2 files changed, 24 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e2f98d15..22a17bca8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
  - (dtucker) [openbsd-compat/readpassphrase.h] Update from OpenBSD 1.3 -> 1.5.
  - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25.
  - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9.
+ - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3271,4 +3272,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3972 2005/11/10 06:03:22 dtucker Exp $
+$Id: ChangeLog,v 1.3973 2005/11/10 06:11:29 dtucker Exp $
diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c
index d58c03e0e..9354f7ae4 100644
--- a/openbsd-compat/getcwd.c
+++ b/openbsd-compat/getcwd.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: getcwd.c,v 1.14 2005/08/08 08:05:34 espie Exp $ */
 /*
  * Copyright (c) 1989, 1991, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -33,10 +34,6 @@
 
 #if !defined(HAVE_GETCWD)
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getcwd.c,v 1.9 2003/06/11 21:03:10 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -54,12 +51,12 @@ static char rcsid[] = "$OpenBSD: getcwd.c,v 1.9 2003/06/11 21:03:10 deraadt Exp
 char *
 getcwd(char *pt, size_t size)
 {
-        register struct dirent *dp;
-        register DIR *dir = NULL;
-        register dev_t dev;
-        register ino_t ino;
-        register int first;
-        register char *bpt, *bup;
+        struct dirent *dp;
+        DIR *dir = NULL;
+        dev_t dev;
+        ino_t ino;
+        int first;
+        char *bpt, *bup;
         struct stat s;
         dev_t root_dev;
         ino_t root_ino;
@@ -80,7 +77,7 @@ getcwd(char *pt, size_t size)
                 }
                 ept = pt + size;
         } else {
-                if ((pt = malloc(ptsize = 1024 - 4)) == NULL)
+                if ((pt = malloc(ptsize = MAXPATHLEN)) == NULL)
                         return (NULL);
                 ept = pt + ptsize;
         }
@@ -88,13 +85,13 @@ getcwd(char *pt, size_t size)
         *bpt = '\0';
 
         /*
-         * Allocate bytes (1024 - malloc space) for the string of "../"'s.
+         * Allocate bytes for the string of "../"'s.
          * Should always be enough (it's 340 levels).  If it's not, allocate
          * as necessary.  Special * case the first stat, it's ".", not "..".
          */
-        if ((up = malloc(upsize = 1024 - 4)) == NULL)
+        if ((up = malloc(upsize = MAXPATHLEN)) == NULL)
                 goto err;
-        eup = up + MAXPATHLEN;
+        eup = up + upsize;
         bup = up;
         up[0] = '.';
         up[1] = '\0';
@@ -139,8 +136,8 @@ getcwd(char *pt, size_t size)
 
                         if ((nup = realloc(up, upsize *= 2)) == NULL)
                                 goto err;
+                        bup = nup + (bup - up);
                         up = nup;
-                        bup = up;
                         eup = up + upsize;
                 }
                 *bup++ = '.';
@@ -175,7 +172,7 @@ getcwd(char *pt, size_t size)
                                         goto notfound;
                                 if (ISDOT(dp))
                                         continue;
-                                memmove(bup, dp->d_name, dp->d_namlen + 1);
+                                memcpy(bup, dp->d_name, dp->d_namlen + 1);
 
                                 /* Save the first error for later. */
                                 if (lstat(up, &s)) {
@@ -193,19 +190,18 @@ getcwd(char *pt, size_t size)
                  * leading slash.
                  */
                 if (bpt - pt < dp->d_namlen + (first ? 1 : 2)) {
-                        size_t len, off;
+                        size_t len;
                         char *npt;
 
                         if (!ptsize) {
                                 errno = ERANGE;
                                 goto err;
                         }
-                        off = bpt - pt;
                         len = ept - bpt;
                         if ((npt = realloc(pt, ptsize *= 2)) == NULL)
                                 goto err;
+                        bpt = npt + (bpt - pt);
                         pt = npt;
-                        bpt = pt + off;
                         ept = pt + ptsize;
                         memmove(ept - len, bpt, len);
                         bpt = ept - len;
@@ -213,7 +209,7 @@ getcwd(char *pt, size_t size)
                 if (!first)
                         *--bpt = '/';
                 bpt -= dp->d_namlen;
-                memmove(bpt, dp->d_name, dp->d_namlen);
+                memcpy(bpt, dp->d_name, dp->d_namlen);
                 (void)closedir(dir);
 
                 /* Truncate any file name. */
@@ -230,12 +226,16 @@ notfound:
                 errno = save_errno ? save_errno : ENOENT;
         /* FALLTHROUGH */
 err:
+        save_errno = errno;
+
         if (ptsize)
                 free(pt);
-        if (up)
-                free(up);
+        free(up);
         if (dir)
                 (void)closedir(dir);
+
+        errno = save_errno;
+
         return (NULL);
 }