mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
Back out a dubious Lite2 change to "optimise" getcwd() to look at $PWD
because it's potentially dangerous (think: symlink races). Move realpath() back to it's original location, and remove getcwd_physical() by renaming it back to getcwd() and zapping the original getcwd wrapper. Noticed by: bde
This commit is contained in:
Peter Wemm
parent
3875dc8d63
commit
098f04f5d1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=23832
@ -1,5 +1,5 @@
|
||||
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
|
||||
# $Id: Makefile.inc,v 1.28 1997/03/11 11:42:56 peter Exp $
|
||||
# $Id: Makefile.inc,v 1.29 1997/03/11 18:20:06 bde Exp $
|
||||
|
||||
# machine-independent gen sources
|
||||
.PATH: ${.CURDIR}/${MACHINE}/gen ${.CURDIR}/gen
|
||||
@ -51,7 +51,7 @@ MAN3+= gen/alarm.3 gen/clock.3 gen/confstr.3 gen/config_open.3 \
|
||||
gen/msgctl.3 gen/msgget.3 gen/msgrcv.3 gen/msgsnd.3 \
|
||||
gen/modf.3 gen/nice.3 \
|
||||
gen/nlist.3 gen/pause.3 gen/popen.3 gen/psignal.3 gen/pwcache.3 \
|
||||
gen/raise.3 gen/rand48.3 gen/realpath.3 \
|
||||
gen/raise.3 gen/rand48.3 \
|
||||
gen/scandir.3 gen/setjmp.3 gen/setmode.3 \
|
||||
gen/siginterrupt.3 gen/signal.3 gen/sigsetops.3 gen/sleep.3 \
|
||||
gen/sysconf.3 gen/sysctl.3 gen/syslog.3 gen/tcgetpgrp.3 \
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
* 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
|
||||
* are met:
|
||||
@ -49,8 +46,6 @@ static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95";
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
static char *getcwd_physical __P((char *, size_t));
|
||||
|
||||
#define ISDOT(dp) \
|
||||
(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
|
||||
(dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
|
||||
@ -59,154 +54,6 @@ char *
|
||||
getcwd(pt, size)
|
||||
char *pt;
|
||||
size_t size;
|
||||
{
|
||||
char *pwd;
|
||||
size_t pwdlen;
|
||||
dev_t dev;
|
||||
ino_t ino;
|
||||
struct stat s;
|
||||
|
||||
/* Check $PWD -- if it's right, it's fast. */
|
||||
if ((pwd = getenv("PWD")) != NULL && pwd[0] == '/' && !stat(pwd, &s)) {
|
||||
dev = s.st_dev;
|
||||
ino = s.st_ino;
|
||||
if (!stat(".", &s) && dev == s.st_dev && ino == s.st_ino) {
|
||||
pwdlen = strlen(pwd);
|
||||
if (size != 0) {
|
||||
if (pwdlen + 1 > size) {
|
||||
errno = ERANGE;
|
||||
return (NULL);
|
||||
}
|
||||
} else if ((pt = malloc(pwdlen + 1)) == NULL)
|
||||
return (NULL);
|
||||
memmove(pt, pwd, pwdlen);
|
||||
pt[pwdlen] = '\0';
|
||||
return (pt);
|
||||
}
|
||||
}
|
||||
|
||||
return (getcwd_physical(pt, size));
|
||||
}
|
||||
|
||||
/*
|
||||
* 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 (*p != '\0' && 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)strcpy(wbuf, p);
|
||||
|
||||
/*
|
||||
* Call the inernal internal version of getcwd which
|
||||
* does a physical search rather than using the $PWD short-cut
|
||||
*/
|
||||
if (getcwd_physical(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, "/");
|
||||
(void)strcat(resolved, wbuf);
|
||||
}
|
||||
|
||||
/* 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);
|
||||
}
|
||||
|
||||
static char *
|
||||
getcwd_physical(pt, size)
|
||||
char *pt;
|
||||
size_t size;
|
||||
{
|
||||
register struct dirent *dp;
|
||||
register DIR *dir;
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
.\" Copyright (c) 1994
|
||||
.\" 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
|
||||
.\" are met:
|
||||
.\" 1. Redistributions of source code must retain the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer.
|
||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer in the
|
||||
.\" documentation and/or other materials provided with the distribution.
|
||||
.\" 3. All advertising materials mentioning features or use of this software
|
||||
.\" must display the following acknowledgement:
|
||||
.\" This product includes software developed by the University of
|
||||
.\" California, Berkeley and its contributors.
|
||||
.\" 4. Neither the name of the University nor the names of its contributors
|
||||
.\" may be used to endorse or promote products derived from this software
|
||||
.\" without specific prior written permission.
|
||||
.\"
|
||||
.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" @(#)realpath.3 8.2 (Berkeley) 2/16/94
|
||||
.\"
|
||||
.Dd "February 16, 1994"
|
||||
.Dt REALPATH 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm realpath
|
||||
.Nd returns the canonicalized absolute pathname
|
||||
.Sh SYNOPSIS
|
||||
.Fd #include <sys/param.h>
|
||||
.Fd #include <stdlib.h>
|
||||
.Ft "char *"
|
||||
.Fn realpath "const char *pathname" "char resolvedname[MAXPATHLEN]"
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Fn realpath
|
||||
function resolves all symbolic links, extra
|
||||
.Dq /
|
||||
characters and references to
|
||||
.Pa /./
|
||||
and
|
||||
.Pa /../
|
||||
in
|
||||
.Fa pathname ,
|
||||
and copies the resulting absolute pathname into
|
||||
the memory referenced by
|
||||
.Fa resolvedname .
|
||||
The
|
||||
.Fa resolvedname
|
||||
argument
|
||||
.Em must
|
||||
refer to a buffer capable of storing at least
|
||||
.Dv MAXPATHLEN
|
||||
characters.
|
||||
.Pp
|
||||
The
|
||||
.Fn realpath
|
||||
function will resolve both absolute and relative paths
|
||||
and return the absolute pathname corresponding to
|
||||
.Fa pathname .
|
||||
All but the last component of
|
||||
.Fa pathname
|
||||
must exist when
|
||||
.Fn realpath
|
||||
is called.
|
||||
.Sh "RETURN VALUES"
|
||||
The
|
||||
.Fn realpath
|
||||
function returns
|
||||
.Fa resolved_name
|
||||
on success.
|
||||
If an error occurs,
|
||||
.Fn realpath
|
||||
returns
|
||||
.Dv NULL ,
|
||||
and
|
||||
.Fa resolved_name
|
||||
contains the pathname which caused the problem.
|
||||
.Sh ERRORS
|
||||
The function
|
||||
.Fn realpath
|
||||
may fail and set the external variable
|
||||
.Va errno
|
||||
for any of the errors specified for the library functions
|
||||
.Xr chdir 2 ,
|
||||
.Xr close 2 ,
|
||||
.Xr fchdir 2 ,
|
||||
.Xr lstat 2 ,
|
||||
.Xr open 2 ,
|
||||
.Xr readlink 2
|
||||
and
|
||||
.Xr getcwd 3 .
|
||||
.Sh CAVEATS
|
||||
This implementation of
|
||||
.Fn realpath
|
||||
differs slightly from the Solaris implementation.
|
||||
The
|
||||
.Bx 4.4
|
||||
version always returns absolute pathnames,
|
||||
whereas the Solaris implementation will,
|
||||
under certain circumstances, return a relative
|
||||
.Fa resolved_path
|
||||
when given a relative
|
||||
.Fa pathname .
|
||||
.Sh "SEE ALSO"
|
||||
.Xr getcwd 3
|
||||
.Sh HISTORY
|
||||
The
|
||||
.Fn realpath
|
||||
function call first appeared in
|
||||
.Bx 4.4 .
|
||||
@ -6,7 +6,7 @@
|
||||
SRCS+= abort.c atexit.c atof.c atoi.c atol.c bsearch.c calloc.c div.c \
|
||||
exit.c getenv.c getopt.c getsubopt.c strhash.c heapsort.c labs.c \
|
||||
ldiv.c malloc.c merge.c putenv.c qsort.c radixsort.c rand.c random.c \
|
||||
setenv.c strtod.c strtol.c strtoq.c strtoul.c \
|
||||
realpath.c setenv.c strtod.c strtol.c strtoq.c strtoul.c \
|
||||
strtouq.c system.c
|
||||
|
||||
# machine-dependent stdlib sources
|
||||
@ -18,7 +18,7 @@ MAN3+= stdlib/abort.3 stdlib/abs.3 stdlib/alloca.3 stdlib/atexit.3 \
|
||||
stdlib/getenv.3 stdlib/getopt.3 stdlib/getsubopt.3 stdlib/labs.3 \
|
||||
stdlib/ldiv.3 stdlib/malloc.3 stdlib/memory.3 stdlib/qsort.3 \
|
||||
stdlib/radixsort.3 stdlib/rand.3 stdlib/random.3 \
|
||||
stdlib/strtod.3 stdlib/strtol.3 stdlib/strtoul.3 \
|
||||
stdlib/realpath.3 stdlib/strtod.3 stdlib/strtol.3 stdlib/strtoul.3 \
|
||||
stdlib/system.3
|
||||
|
||||
MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user