hurd: Use __trivfs_server_name instead of trivfs_server_name
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Sat, 1 Jan 2022 16:51:18 +0000 (17:51 +0100)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Sat, 1 Jan 2022 16:51:18 +0000 (17:51 +0100)
The latter violates namespace contraints

sysdeps/mach/hurd/getrandom.c

index 24f9ac6..76f2e90 100644 (file)
@@ -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;