diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-14 19:22:44 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-14 19:22:44 +0000 |
| commit | 9138bf01b3b21ce23cfdf15fce3f30bb9a1fbc61 (patch) | |
| tree | fb0ac2208e1a080dfae3f2ca5f1f90f568bf4165 /libc/sysdeps/linux/common/getcwd.c | |
| parent | 6e3c1938ff129fb5385a963ec600111aa6228bdc (diff) | |
| download | uClibc-alpine-9138bf01b3b21ce23cfdf15fce3f30bb9a1fbc61.tar.bz2 uClibc-alpine-9138bf01b3b21ce23cfdf15fce3f30bb9a1fbc61.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux/common/getcwd.c')
| -rw-r--r-- | libc/sysdeps/linux/common/getcwd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/sysdeps/linux/common/getcwd.c b/libc/sysdeps/linux/common/getcwd.c index 71134af09..a44647d67 100644 --- a/libc/sysdeps/linux/common/getcwd.c +++ b/libc/sysdeps/linux/common/getcwd.c @@ -2,6 +2,7 @@ #define opendir __opendir #define closedir __closedir +#define readdir __readdir #include <stdlib.h> #include <errno.h> @@ -42,7 +43,7 @@ static char *search_dir(dev_t this_dev, ino_t this_ino, char *path_buf, int path int slow_search = (sizeof(ino_t) != sizeof(d->d_ino)); #endif - if (stat(path_buf, &st) < 0) { + if (__stat(path_buf, &st) < 0) { goto oops; } #ifdef FAST_DIR_SEARCH_POSSIBLE @@ -74,7 +75,7 @@ static char *search_dir(dev_t this_dev, ino_t this_ino, char *path_buf, int path goto oops; } __strcpy(ptr + 1, d->d_name); - if (stat(path_buf, &st) < 0) + if (__stat(path_buf, &st) < 0) continue; if (st.st_ino == this_ino && st.st_dev == this_dev) { closedir(dp); @@ -100,7 +101,7 @@ static char *recurser(char *path_buf, int path_size, dev_t root_dev, ino_t root_ dev_t this_dev; ino_t this_ino; - if (stat(path_buf, &st) < 0) { + if (__stat(path_buf, &st) < 0) { if (errno != EFAULT) goto oops; return 0; @@ -139,7 +140,7 @@ int __syscall_getcwd(char * buf, unsigned long size) len = -1; /* get stat for root to have a valid parameters for the terminating condition */ - if (stat("/", &st) < 0) { + if (__stat("/", &st) < 0) { /* root dir not found! */ return -1; } |