diff options
| author | perry <perry@NetBSD.org> | 1998-02-02 23:20:35 +0000 |
|---|---|---|
| committer | perry <perry@NetBSD.org> | 1998-02-02 23:20:35 +0000 |
| commit | 764a8201df53decbaa178e7afff2650e0c4bcd2e (patch) | |
| tree | e1e9acfd643d894651c31df483bab9205b016576 /lib/libc/stdlib | |
| parent | f98d9155979ec08eb3e140322c6654be58ad8c81 (diff) | |
realpath is now part of getcwd.c in gen/; man page moved to gen, too.
Diffstat (limited to 'lib/libc/stdlib')
| -rw-r--r-- | lib/libc/stdlib/Makefile.inc | 22 | ||||
| -rw-r--r-- | lib/libc/stdlib/realpath.3 | 127 | ||||
| -rw-r--r-- | lib/libc/stdlib/realpath.c | 170 |
3 files changed, 10 insertions, 309 deletions
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 1283e14f1a2..f514b228d78 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -1,16 +1,15 @@ -# $NetBSD: Makefile.inc,v 1.36 1998/02/01 14:03:47 frueauf Exp $ +# $NetBSD: Makefile.inc,v 1.37 1998/02/02 23:20:35 perry Exp $ # from: @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 # stdlib sources .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib -# add getsubopt.c later -SRCS+= _rand48.c _strtoq.c _strtouq.c a64l.c abort.c atexit.c atof.c atoi.c \ - atol.c bsearch.c calloc.c drand48.c erand48.c exit.c getenv.c \ - getopt.c heapsort.c jrand48.c l64a.c lcong48.c \ - lrand48.c malloc.c merge.c mrand48.c multibyte.c nrand48.c \ - putenv.c qabs.c qdiv.c qsort.c radixsort.c rand.c rand_r.c \ - random.c realpath.c seed48.c setenv.c srand48.c strtod.c \ +SRCS+= _rand48.c _strtoq.c _strtouq.c a64l.c abort.c atexit.c atof.c \ + atoi.c atol.c bsearch.c calloc.c drand48.c erand48.c exit.c \ + getenv.c getopt.c getsubopt.c heapsort.c jrand48.c l64a.c \ + lcong48.c lrand48.c malloc.c merge.c mrand48.c multibyte.c \ + nrand48.c putenv.c qabs.c qdiv.c qsort.c radixsort.c rand.c \ + rand_r.c random.c seed48.c setenv.c srand48.c strtod.c \ strtol.c strtoq.c strtoq.c strtoul.c strtouq.c system.c # machine-dependent stdlib sources @@ -19,12 +18,11 @@ SRCS+= _rand48.c _strtoq.c _strtouq.c a64l.c abort.c atexit.c atof.c atoi.c \ .include "${.CURDIR}/arch/${MACHINE_ARCH}/stdlib/Makefile.inc" -# add getsubopt.3 later MAN+= abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ - calloc.3 div.3 exit.3 free.3 getenv.3 getopt.3 \ + calloc.3 div.3 exit.3 free.3 getenv.3 getopt.3 getsubopt.3 \ labs.3 ldiv.3 malloc.3 memory.3 qabs.3 qdiv.3 qsort.3 \ - radixsort.3 rand48.3 rand.3 random.3 realloc.3 realpath.3 \ - strtod.3 strtol.3 strtoul.3 system.3 + radixsort.3 rand48.3 rand.3 random.3 realloc.3 strtod.3 \ + strtol.3 strtoul.3 system.3 MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 diff --git a/lib/libc/stdlib/realpath.3 b/lib/libc/stdlib/realpath.3 deleted file mode 100644 index bcafeb984d8..00000000000 --- a/lib/libc/stdlib/realpath.3 +++ /dev/null @@ -1,127 +0,0 @@ -.\" $NetBSD: realpath.3,v 1.3 1997/05/29 01:48:19 cgd Exp $ -.\" -.\" 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. -.\" -.\" from: @(#)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 . diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c deleted file mode 100644 index 62d1db8f824..00000000000 --- a/lib/libc/stdlib/realpath.c +++ /dev/null @@ -1,170 +0,0 @@ -/* $NetBSD: realpath.c,v 1.5 1997/07/21 14:09:03 jtc Exp $ */ - -/* - * 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. - */ - -#include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "from: @(#)realpath.c 8.1 (Berkeley) 2/16/94"; -#else -__RCSID("$NetBSD: realpath.c,v 1.5 1997/07/21 14:09:03 jtc Exp $"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include "namespace.h" -#include <sys/param.h> -#include <sys/stat.h> - -#include <errno.h> -#include <fcntl.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#ifdef __weak_alias -__weak_alias(realpath,_realpath); -#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)strncpy(resolved, ".", MAXPATHLEN - 1); - 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); - 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); -} |
