Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/getcwd.c,v retrieving revision 1.2 retrieving revision 1.20 diff -u -p -r1.2 -r1.20 --- src/lib/libc/gen/getcwd.c 1993/07/30 08:22:24 1.2 +++ src/lib/libc/gen/getcwd.c 1999/07/11 18:01:46 1.20 @@ -1,6 +1,11 @@ +/* $NetBSD: getcwd.c,v 1.20 1999/07/11 18:01:46 sommerfeld Exp $ */ + /* - * Copyright (c) 1989, 1991 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1991, 1993, 1995 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Jan-Simon Pendry. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,41 +36,178 @@ * SUCH DAMAGE. */ +#include #if defined(LIBC_SCCS) && !defined(lint) -/*static char sccsid[] = "from: @(#)getcwd.c 5.11 (Berkeley) 2/24/91";*/ -static char rcsid[] = "$Id: getcwd.c,v 1.2 1993/07/30 08:22:24 mycroft Exp $"; +#if 0 +static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95"; +#else +__RCSID("$NetBSD: getcwd.c,v 1.20 1999/07/11 18:01:46 sommerfeld Exp $"); +#endif #endif /* LIBC_SCCS and not lint */ +#include "namespace.h" #include #include -#include + #include +#include +#include #include #include #include #include +#include "extern.h" + +#ifdef __weak_alias +__weak_alias(getcwd,_getcwd); +__weak_alias(realpath,_realpath); +#endif + #define ISDOT(dp) \ (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \ - dp->d_name[1] == '.' && dp->d_name[2] == '\0')) + (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))) + + +#if defined(__SVR4) || defined(__svr4__) +#define d_fileno d_ino +#endif + +/* + * char *realpath(const char *path, char resolved_path[MAXPATHLEN]); + * + * Find the real name of path, by removing all ".", ".." and symlink + * components. Returns (resolved) on success, or (NULL) on failure, + * in which case the path which caused trouble is left in (resolved). + */ +char * +realpath(path, resolved) + const char *path; + char *resolved; +{ + struct stat sb; + int fd, n, rootd, serrno; + char *p, *q, wbuf[MAXPATHLEN]; + + /* Save the starting point. */ + if ((fd = open(".", O_RDONLY)) < 0) { + (void)strcpy(resolved, "."); + return (NULL); + } + + /* + * Find the dirname and basename from the path to be resolved. + * Change directory to the dirname component. + * lstat the basename part. + * if it is a symlink, read in the value and loop. + * if it is a directory, then change to that directory. + * get the current directory name and append the basename. + */ + (void)strncpy(resolved, path, MAXPATHLEN - 1); + resolved[MAXPATHLEN - 1] = '\0'; +loop: + q = strrchr(resolved, '/'); + if (q != NULL) { + p = q + 1; + if (q == resolved) + q = "/"; + else { + do { + --q; + } while (q > resolved && *q == '/'); + q[1] = '\0'; + q = resolved; + } + if (chdir(q) < 0) + goto err1; + } else + p = resolved; + + /* Deal with the last component. */ + if (lstat(p, &sb) == 0) { + if (S_ISLNK(sb.st_mode)) { + n = readlink(p, resolved, MAXPATHLEN); + if (n < 0) + goto err1; + resolved[n] = '\0'; + goto loop; + } + if (S_ISDIR(sb.st_mode)) { + if (chdir(p) < 0) + goto err1; + p = ""; + } + } + + /* + * Save the last component name and get the full pathname of + * the current directory. + */ + (void)strncpy(wbuf, p, (sizeof(wbuf) - 1)); + + /* + * Call the inernal internal version of getcwd which + * does a physical search rather than using the $PWD short-cut + */ + if (getcwd(resolved, MAXPATHLEN) == 0) + goto err1; + + /* + * Join the two strings together, ensuring that the right thing + * happens if the last component is empty, or the dirname is root. + */ + if (resolved[0] == '/' && resolved[1] == '\0') + rootd = 1; + else + rootd = 0; + + if (*wbuf) { + if (strlen(resolved) + strlen(wbuf) + rootd + 1 > MAXPATHLEN) { + errno = ENAMETOOLONG; + goto err1; + } + if (rootd == 0) + (void)strcat(resolved, "/"); /* XXX: strcat is safe */ + (void)strcat(resolved, wbuf); /* XXX: strcat is safe */ + } + + /* Go back to where we came from. */ + if (fchdir(fd) < 0) { + serrno = errno; + goto err2; + } + + /* It's okay if the close fails, what's an fd more or less? */ + (void)close(fd); + return (resolved); + +err1: serrno = errno; + (void)fchdir(fd); +err2: (void)close(fd); + errno = serrno; + return (NULL); +} + +#ifdef OLD_GETCWD char * getcwd(pt, size) char *pt; size_t size; { - register struct dirent *dp; - register DIR *dir; - register dev_t dev; - register ino_t ino; - register int first; - register char *bpt, *bup; + struct dirent *dp; + DIR *dir; + dev_t dev; + ino_t ino; + int first; + char *bpt, *bup; struct stat s; dev_t root_dev; ino_t root_ino; size_t ptsize, upsize; int save_errno; char *ept, *eup, *up; + size_t dlen; /* * If no buffer specified by the user, allocate one as necessary. @@ -76,12 +218,12 @@ getcwd(pt, size) ptsize = 0; if (!size) { errno = EINVAL; - return((char *)NULL); + return (NULL); } ept = pt + size; } else { - if (!(pt = (char *)malloc(ptsize = 1024 - 4))) - return((char *)NULL); + if ((pt = malloc(ptsize = 1024 - 4)) == NULL) + return (NULL); ept = pt + ptsize; } bpt = ept - 1; @@ -90,9 +232,9 @@ getcwd(pt, size) /* * Allocate bytes (1024 - malloc space) 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 "..". + * as necessary. Special case the first stat, it's ".", not "..". */ - if (!(up = (char *)malloc(upsize = 1024 - 4))) + if ((up = malloc(upsize = 1024 - 4)) == NULL) goto err; eup = up + MAXPATHLEN; bup = up; @@ -124,9 +266,9 @@ getcwd(pt, size) * path to the beginning of the buffer, but it's always * been that way and stuff would probably break. */ - (void)bcopy(bpt, pt, ept - bpt); + memmove(pt, bpt, (size_t)(ept - bpt)); free(up); - return(pt); + return (pt); } /* @@ -135,8 +277,9 @@ getcwd(pt, size) * possible component name, plus a trailing NULL. */ if (bup + 3 + MAXNAMLEN + 1 >= eup) { - if (!(up = (char *)realloc(up, upsize *= 2))) + if ((up = realloc(up, upsize *= 2)) == NULL) goto err; + bup = up; eup = up + upsize; } *bup++ = '.'; @@ -160,8 +303,14 @@ getcwd(pt, size) for (;;) { if (!(dp = readdir(dir))) goto notfound; - if (dp->d_fileno == ino) + if (dp->d_fileno == ino) { +#if defined(__SVR4) || defined(__svr4__) || defined(__linux__) + dlen = strlen(dp->d_name); +#else + dlen = dp->d_namlen; +#endif break; + } } } else for (;;) { @@ -169,7 +318,12 @@ getcwd(pt, size) goto notfound; if (ISDOT(dp)) continue; - bcopy(dp->d_name, bup, dp->d_namlen + 1); +#if defined(__SVR4) || defined(__svr4__) || defined(__linux__) + dlen = strlen(dp->d_name); +#else + dlen = dp->d_namlen; +#endif + memmove(bup, dp->d_name, dlen + 1); /* Save the first error for later. */ if (lstat(up, &s)) { @@ -186,7 +340,7 @@ getcwd(pt, size) * Check for length of the current name, preceding slash, * leading slash. */ - if (bpt - pt <= dp->d_namlen + (first ? 1 : 2)) { + if (bpt - pt <= dlen + (first ? 1 : 2)) { size_t len, off; if (!ptsize) { @@ -195,17 +349,17 @@ getcwd(pt, size) } off = bpt - pt; len = ept - bpt; - if (!(pt = (char *)realloc(pt, ptsize *= 2))) + if ((pt = realloc(pt, ptsize *= 2)) == NULL) goto err; bpt = pt + off; ept = pt + ptsize; - (void)bcopy(bpt, ept - len, len); + memmove(ept - len, bpt, len); bpt = ept - len; } if (!first) *--bpt = '/'; - bpt -= dp->d_namlen; - bcopy(dp->d_name, bpt, dp->d_namlen); + bpt -= dlen; + memmove(bpt, dp->d_name, dlen); (void)closedir(dir); /* Truncate any file name. */ @@ -225,5 +379,52 @@ err: if (ptsize) free(pt); free(up); - return((char *)NULL); + return (NULL); } + +#else /* New getcwd */ + +char * +getcwd(pt, size) + char *pt; + size_t size; +{ + size_t ptsize, bufsize; + int len; + + /* + * If no buffer specified by the user, allocate one as necessary. + * If a buffer is specified, the size has to be non-zero. The path + * is built from the end of the buffer backwards. + */ + if (pt) { + ptsize = 0; + if (!size) { + errno = EINVAL; + return (NULL); + } + bufsize = size; + } else { + if ((pt = malloc(ptsize = 1024 - 4)) == NULL) + return (NULL); + bufsize = ptsize; + } + for (;;) { + len = __getcwd(pt, bufsize); + if ((len < 0) && (size == 0) && (errno == ERANGE)) { + if (ptsize > (MAXPATHLEN*4)) + return NULL; + if ((pt = realloc(pt, ptsize *= 2)) == NULL) + return NULL; + bufsize = ptsize; + continue; + } + break; + } + if (len < 0) + return NULL; + else + return pt; +} + +#endif