diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-26 02:31:52 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-26 02:31:52 +0100 |
| commit | 44cd6e24d054d2cf263e387cad905fd73e43de34 (patch) | |
| tree | 4c2cd4c91bde5659c919e3c9278e44deabc44990 | |
| parent | 2e4068dc7e5a454bc0f950dc07358d4d4396c380 (diff) | |
| parent | 52c643a036e34438b86d73981c89b8c379cc762f (diff) | |
Merge branch 't/remap_getcwd' into refs/top-bases/tschwinge/Roger_Whittaker
| -rw-r--r-- | sysdeps/mach/hurd/getcwd.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c index e4cea5c287..fdbcaf8437 100644 --- a/sysdeps/mach/hurd/getcwd.c +++ b/sysdeps/mach/hurd/getcwd.c @@ -267,11 +267,6 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir, So the root is our current directory. */ *--file_namep = '/'; - if (thisid != rootid) - /* We did not get to our root directory. The returned name should - not begin with a slash. */ - ++file_namep; - memmove (file_name, file_namep, file_name + size - file_namep); cleanup (); return file_name; @@ -311,13 +306,6 @@ __getcwd (char *buf, size_t size) __USEPORT (CWDIR, _hurd_canonicalize_directory_name_internal (port, buf, size)); - if (cwd && cwd[0] != '/') - { - /* `cwd' is an unknown root directory. */ - if (buf == NULL) - free (cwd); - return __hurd_fail (EGRATUITOUS), NULL; - } return cwd; } weak_alias (__getcwd, getcwd) |