diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
| commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
| tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /sysdeps/mach/hurd/getcwd.c | |
| parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'sysdeps/mach/hurd/getcwd.c')
| -rw-r--r-- | sysdeps/mach/hurd/getcwd.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c index a757dab965..c30b7c507b 100644 --- a/sysdeps/mach/hurd/getcwd.c +++ b/sysdeps/mach/hurd/getcwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -37,7 +37,7 @@ a slash to indicate that it is relative to some unknown root directory. */ char * -_hurd_canonicalize_directory_name_internal (file_t thisdir, +__hurd_canonicalize_directory_name_internal (file_t thisdir, char *buf, size_t size) { @@ -282,6 +282,7 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir, cleanup (); return NULL; } +strong_alias (__hurd_canonicalize_directory_name_internal, _hurd_canonicalize_directory_name_internal) char * __canonicalize_directory_name_internal (const char *thisdir, char *buf, @@ -291,7 +292,7 @@ __canonicalize_directory_name_internal (const char *thisdir, char *buf, file_t port = __file_name_lookup (thisdir, 0, 0); if (port == MACH_PORT_NULL) return NULL; - result = _hurd_canonicalize_directory_name_internal (port, buf, size); + result = __hurd_canonicalize_directory_name_internal (port, buf, size); __mach_port_deallocate (__mach_task_self (), port); return result; } @@ -306,8 +307,8 @@ __getcwd (char *buf, size_t size) { char *cwd = __USEPORT (CWDIR, - _hurd_canonicalize_directory_name_internal (port, - buf, size)); + __hurd_canonicalize_directory_name_internal (port, + buf, size)); if (cwd && cwd[0] != '/') { /* `cwd' is an unknown root directory. */ |