merged hpn12v17 to trunk

[gssapi-openssh.git] / openssh / openbsd-compat / realpath.c

diff --git a/openssh/openbsd-compat/realpath.c b/openssh/openbsd-compat/realpath.c
index b4a05db95314ca677a9b35ab4f2a38a02a53536c..ec801d498dc9d21b82d05a5ec54760df7c293b74 100644 (file)
--- a/openssh/openbsd-compat/realpath.c
+++ b/openssh/openbsd-compat/realpath.c
@@ -32,7 +32,7 @@
 #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH)
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: realpath.c,v 1.6 2002/01/12 16:24:35 millert Exp $";
+static char *rcsid = "$OpenBSD: realpath.c,v 1.5 2001/06/27 00:58:56 lebel Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -74,10 +74,6 @@ realpath(const char *path, char *resolved)
        }
        close(fd);
 
-       /* Convert "." -> "" to optimize away a needless lstat() and chdir() */
-       if (path[0] == '.' && path[1] == '\0')
-               path = "";
-
        /*
         * Find the dirname and basename from the path to be resolved.
         * Change directory to the dirname component.
@@ -106,7 +102,7 @@ loop:
                p = resolved;
 
        /* Deal with the last component. */
-       if (*p != '\0' && lstat(p, &sb) == 0) {
+       if (lstat(p, &sb) == 0) {
                if (S_ISLNK(sb.st_mode)) {
                        if (++symlinks > MAXSYMLINKS) {
                                serrno = ELOOP;