qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-13 15:00:23 -07:00
Code Releases Activity

lib9: use $PWD in getwd

Browse Source 
This makes the full file paths recorded by 6g
prefer $PWD over the actual directory name
(relevant when $PWD gets to the current directory
via symlinks).  It's what everyone else does, and
what people expect.

R=iant, r, mattn.jp
CC=golang-dev
https://golang.org/cl/4824041
This commit is contained in:
Russ Cox 2011-07-22 21:21:17 -04:00
parent 4e5e12e305
commit a667e44e75
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib9/getwd.c
View File

@ -3,6 +3,7 @@ Plan 9 from User Space src/lib9/getwd.c
http://code.swtch.com/plan9port/src/tip/src/lib9/getwd.c http://code.swtch.com/plan9port/src/tip/src/lib9/getwd.c
Copyright 2001-2007 Russ Cox. All Rights Reserved. Copyright 2001-2007 Russ Cox. All Rights Reserved.
Portions Copyright 2011 The Go Authors. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -23,6 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
#include <u.h> #include <u.h>
#include <errno.h>
#include <sys/stat.h>
#include <libc.h> #include <libc.h>
#undef getwd #undef getwd
@ -30,5 +33,23 @@ THE SOFTWARE.
char* char*
p9getwd(char *s, int ns) p9getwd(char *s, int ns)
{ {
char *pwd;
struct stat st1, st2;
// Clumsy but widespread kludge:
// if $PWD is set and matches ".", use it.
// Matches glibc's get_current_dir_name and Go's os.Getwd.
pwd = getenv("PWD"); // note: getenv, not p9getenv, so no free
if(pwd != nil && pwd[0] &&
stat(pwd, &st1) >= 0 && stat(".", &st2) >= 0 &&
st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) {
if(strlen(pwd) >= ns) {
errno = ERANGE;
return nil;
}
strcpy(s, pwd);
return s;
}
return getcwd(s, ns); return getcwd(s, ns);
} }