diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/getcwd.c | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -30,6 +30,8 @@ | |||
30 | - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25. | 30 | - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25. |
31 | - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9. | 31 | - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9. |
32 | - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14. | 32 | - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14. |
33 | - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up | ||
34 | with OpenBSD code since we don't support platforms without fstat any more. | ||
33 | 35 | ||
34 | 20051105 | 36 | 20051105 |
35 | - (djm) OpenBSD CVS Sync | 37 | - (djm) OpenBSD CVS Sync |
@@ -3272,4 +3274,4 @@ | |||
3272 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3274 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3273 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3275 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3274 | 3276 | ||
3275 | $Id: ChangeLog,v 1.3973 2005/11/10 06:11:29 dtucker Exp $ | 3277 | $Id: ChangeLog,v 1.3974 2005/11/10 06:15:06 dtucker Exp $ |
diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c index 9354f7ae4..711cb9cd5 100644 --- a/openbsd-compat/getcwd.c +++ b/openbsd-compat/getcwd.c | |||
@@ -144,10 +144,8 @@ getcwd(char *pt, size_t size) | |||
144 | *bup++ = '.'; | 144 | *bup++ = '.'; |
145 | *bup = '\0'; | 145 | *bup = '\0'; |
146 | 146 | ||
147 | /* Open and stat parent directory. | 147 | /* Open and stat parent directory. */ |
148 | * RACE?? - replaced fstat(dirfd(dir), &s) w/ lstat(up,&s) | 148 | if (!(dir = opendir(up)) || fstat(dirfd(dir), &s)) |
149 | */ | ||
150 | if (!(dir = opendir(up)) || lstat(up,&s)) | ||
151 | goto err; | 149 | goto err; |
152 | 150 | ||
153 | /* Add trailing slash for next directory. */ | 151 | /* Add trailing slash for next directory. */ |