commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [hurd, commited] hurd: Use __trivfs_server_name instead of trivfs_se


From: Florian Weimer
Subject: Re: [hurd, commited] hurd: Use __trivfs_server_name instead of trivfs_server_name
Date: Sat, 01 Jan 2022 18:27:49 +0100

* Samuel Thibault:

> The latter violates namespace contraints
> ---
>  sysdeps/mach/hurd/getrandom.c | 18 +++++++++---------
>  1 file 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;

How does this work?  It's a new synbol name, so there's no definition,
so the weak reference is always null.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]