diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-01-01 17:51:18 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2022-01-01 17:51:18 +0100 |
| commit | edb5ab841a049c8a8267ebc4d537eec690952daa (patch) | |
| tree | f12428b88a96a6c465e2350b44c42ad89f5d0d3f | |
| parent | 35cf8a85ed87b70db021d3b8a5026cec9d9094dd (diff) | |
| download | glibc-edb5ab841a049c8a8267ebc4d537eec690952daa.tar.gz glibc-edb5ab841a049c8a8267ebc4d537eec690952daa.tar.xz glibc-edb5ab841a049c8a8267ebc4d537eec690952daa.zip | |
hurd: Use __trivfs_server_name instead of trivfs_server_name
The latter violates namespace contraints
| -rw-r--r-- | sysdeps/mach/hurd/getrandom.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sysdeps/mach/hurd/getrandom.c b/sysdeps/mach/hurd/getrandom.c index 24f9ac60f7..76f2e900d2 100644 --- a/sysdeps/mach/hurd/getrandom.c +++ b/sysdeps/mach/hurd/getrandom.c @@ -21,7 +21,7 @@ #include <unistd.h> #include <not-cancel.h> -extern char *trivfs_server_name __attribute__((weak)); +extern char *__trivfs_server_name __attribute__((weak)); /* Write up to LENGTH bytes of randomness starting at BUFFER. Return the number of bytes written, or -1 on error. */ @@ -33,14 +33,14 @@ __getrandom (void *buffer, size_t length, unsigned int flags) size_t amount_read; int fd; - if (&trivfs_server_name && trivfs_server_name - && trivfs_server_name[0] == 'r' - && trivfs_server_name[1] == 'a' - && trivfs_server_name[2] == 'n' - && trivfs_server_name[3] == 'd' - && trivfs_server_name[4] == 'o' - && trivfs_server_name[5] == 'm' - && trivfs_server_name[6] == '\0') + if (&__trivfs_server_name && __trivfs_server_name + && __trivfs_server_name[0] == 'r' + && __trivfs_server_name[1] == 'a' + && __trivfs_server_name[2] == 'n' + && __trivfs_server_name[3] == 'd' + && __trivfs_server_name[4] == 'o' + && __trivfs_server_name[5] == 'm' + && __trivfs_server_name[6] == '\0') /* We are random, don't try to read ourselves! */ return length; |