diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/getcwd.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/getcwd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c index 3f21ae743f..866b9d26d5 100644 --- a/sysdeps/unix/sysv/linux/getcwd.c +++ b/sysdeps/unix/sysv/linux/getcwd.c @@ -1,5 +1,5 @@ /* Determine current working directory. Linux version. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -40,7 +40,7 @@ named `cwd'. Reading the content of this link immediate gives us the information. But we have to take care for systems which do not have the proc filesystem mounted. Use the POSIX implementation in this case. */ -static char *generic_getcwd (char *buf, size_t size) internal_function; +static char *generic_getcwd (char *buf, size_t size); char * __getcwd (char *buf, size_t size) @@ -76,7 +76,7 @@ __getcwd (char *buf, size_t size) int retval; retval = INLINE_SYSCALL (getcwd, 2, path, alloc_size); - if (retval >= 0) + if (retval > 0 && path[0] == '/') { #ifndef NO_ALLOCATION if (buf == NULL && size == 0) @@ -92,10 +92,10 @@ __getcwd (char *buf, size_t size) return buf; } - /* The system call cannot handle paths longer than a page. - Neither can the magic symlink in /proc/self. Just use the + /* The system call either cannot handle paths longer than a page + or can succeed without returning an absolute path. Just use the generic implementation right away. */ - if (errno == ENAMETOOLONG) + if (retval >= 0 || errno == ENAMETOOLONG) { #ifndef NO_ALLOCATION if (buf == NULL && size == 0) @@ -130,6 +130,6 @@ __getcwd (char *buf, size_t size) weak_alias (__getcwd, getcwd) /* Get the code for the generic version. */ -#define GETCWD_RETURN_TYPE static char * internal_function +#define GETCWD_RETURN_TYPE static char * #define __getcwd generic_getcwd #include <sysdeps/posix/getcwd.c> |