From 82caf4596d03519c53248b01d882eaa44de79bd6 Mon Sep 17 00:00:00 2001 From: dg Date: Tue, 7 Feb 1995 05:52:57 +0000 Subject: Backed out Keith Bostic's getcwd/$PWD hack. It is causing things to break all over the place. --- lib/libc/gen/getcwd.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'lib/libc/gen/getcwd.c') diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c index d14f9af..2757d3b 100644 --- a/lib/libc/gen/getcwd.c +++ b/lib/libc/gen/getcwd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1989, 1991, 1993, 1995 + * Copyright (c) 1989, 1991, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)getcwd.c 8.2 (Berkeley) 1/31/95"; +static char sccsid[] = "@(#)getcwd.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include @@ -63,29 +63,10 @@ getcwd(pt, size) struct stat s; dev_t root_dev; ino_t root_ino; - size_t ptsize, pwdlen, upsize; + size_t ptsize, upsize; int save_errno; - char *ept, *eup, *pwd, *up; + char *ept, *eup, *up; - /* Check $PWD -- if it's right, it's fast. */ - if ((pwd = getenv("PWD")) != NULL && !stat(pwd, &s) && *pwd == '/') { - 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); - pwd[pwdlen] = '\0'; - return (pt); - } - } - /* * 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 @@ -113,7 +94,7 @@ 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 = malloc(upsize = 1024 - 4)) == NULL) goto err; -- cgit v1.1