[PATCH 4/4] Consolidate Linux truncate implementations
Yury Norov
ynorov@caviumnetworks.com
Thu Sep 22 14:25:00 GMT 2016
On Tue, Sep 20, 2016 at 12:01:54PM -0300, Adhemerval Zanella wrote:
> diff --git a/sysdeps/unix/sysv/linux/truncate.c b/sysdeps/unix/sysv/linux/truncate.c
> new file mode 100644
> index 0000000..9e71288
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/truncate.c
> @@ -0,0 +1,35 @@
> +/* Copyright (C) 2016 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
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library. If not, see
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <unistd.h>
> +#include <sysdep.h>
> +#include <errno.h>
> +
> +#ifndef __OFF_T_MATCHES_OFF64_T
> +/* Truncate PATH to LENGTH bytes. */
> +int
> +__truncate (const char *path, off_t length)
> +{
> +# ifndef __NR_truncate
> + return INLINE_SYSCALL_CALL (truncate64, path,
> + __ALIGNMENT_ARG SYSCALL_LL (length));
> +# else
> + return INLINE_SYSCALL_CALL (truncate, path, length);
> +# endif
> +}
> +weak_alias (__truncate, truncate)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c
> index 92a6bc4..0d70da7 100644
> --- a/sysdeps/unix/sysv/linux/truncate64.c
> +++ b/sysdeps/unix/sysv/linux/truncate64.c
> @@ -15,21 +15,23 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sys/types.h>
> -#include <endian.h>
> -#include <errno.h>
> #include <unistd.h>
> -
> #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <errno.h>
>
> -/* Truncate the file referenced by FD to LENGTH bytes. */
> +#ifndef __NR_truncate64
> +# define __NR_truncate64 __NR_truncate
> +#endif
> +
> +/* Truncate PATH to LENGTH bytes. */
> int
> -truncate64 (const char *path, off64_t length)
> +__truncate64 (const char *path, off64_t length)
> {
> - unsigned int low = length & 0xffffffff;
> - unsigned int high = length >> 32;
> - int result = INLINE_SYSCALL (truncate64, 3, path,
> - __LONG_LONG_PAIR (high, low));
> - return result;
> + return INLINE_SYSCALL_CALL (truncate64, path,
> + __ALIGNMENT_ARG SYSCALL_LL64 (length));
> }
> +weak_alias (__truncate64, truncate64)
> +
> +#ifdef __OFF_T_MATCHES_OFF64_T
> +weak_alias (__truncate64, truncate);
> +#endif
It seems you forgot weak_alias (__truncate64, __truncate);
More information about the Libc-alpha
mailing list