[PATCH 09/30] Linux: consolidate link implementation

[Carlos O'Donell]

On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Use link syscall if defined, otherwise use linkat.
> 
> Checked on x86_64-linux-gnu.

LGTM.

No regressions on x86_64 and i686.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>


> ---
>  sysdeps/unix/sysv/linux/{generic => }/link.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/link.c (78%)
> 
> diff --git a/sysdeps/unix/sysv/linux/generic/link.c b/sysdeps/unix/sysv/linux/link.c
> similarity index 78%
> rename from sysdeps/unix/sysv/linux/generic/link.c
> rename to sysdeps/unix/sysv/linux/link.c
> index e07655d521..eb4fe1569e 100644
> --- a/sysdeps/unix/sysv/linux/generic/link.c
> +++ b/sysdeps/unix/sysv/linux/link.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Make a new name for a file.  Linux version.
> +   Copyright (C) 2011-2022 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
> @@ -23,7 +24,11 @@
>  int
>  __link (const char *from, const char *to)
>  {
> -  return INLINE_SYSCALL (linkat, 5, AT_FDCWD, from, AT_FDCWD, to, 0);
> +#ifdef __NR_link
> +  return INLINE_SYSCALL_CALL (link, from, to);
> +#else
> +  return INLINE_SYSCALL_CALL (linkat, AT_FDCWD, from, AT_FDCWD, to, 0);
> +#endif

OK.

>  }
>  
>  weak_alias (__link, link)

-- 
Cheers,
Carlos.