From dfaaee33ba68372e374c14ec05fc8a76bdccdceb Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 3 Nov 2015 10:04:25 -0200 Subject: [PATCH] Consolidate Linux write syscall This patch consolidates the write Linux syscall implementation on sysdeps/unix/sysv/linux/write.c. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu. * include/unistd.h (write): Add hidden proto. * io/Makefile (CFLAGS-write.c): New rule. * nptl/Makefile (CFLAGS-write.c): Likewise. * sysdeps/unix/sysv/linux/write.c: New file. --- ChangeLog | 5 +++++ include/unistd.h | 1 + io/Makefile | 1 + nptl/Makefile | 1 + sysdeps/unix/sysv/linux/write.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/write.c diff --git a/ChangeLog b/ChangeLog index 1101834e04..19193464bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2016-05-10 Adhemerval Zanella + * include/unistd.h (write): Add hidden proto. + * io/Makefile (CFLAGS-write.c): New define. + * nptl/Makefile (CFLAGS-write.c): Likewise. + * sysdeps/unix/sysv/linux/write.c: New file. + [BZ #21428] * include/unistd.h (read): Add hidden proto. * io/Makefile (CFLAGS-read.c): New define. diff --git a/include/unistd.h b/include/unistd.h index 01556d3c7b..0cdf06e513 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -56,6 +56,7 @@ libc_hidden_proto (__libc_read) libc_hidden_proto (read) extern ssize_t __libc_write (int __fd, const void *__buf, size_t __n); libc_hidden_proto (__libc_write) +libc_hidden_proto (write) extern int __pipe (int __pipedes[2]); libc_hidden_proto (__pipe) extern int __pipe2 (int __pipedes[2], int __flags); diff --git a/io/Makefile b/io/Makefile index db14c0dd82..16365e581a 100644 --- a/io/Makefile +++ b/io/Makefile @@ -101,6 +101,7 @@ CFLAGS-fallocate.c = -fexceptions CFLAGS-fallocate64.c = -fexceptions CFLAGS-sync_file_range.c = -fexceptions CFLAGS-read.c = -fexceptions +CFLAGS-write.c = -fexceptions CFLAGS-test-stat.c = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS-test-lfs.c = -D_LARGEFILE64_SOURCE diff --git a/nptl/Makefile b/nptl/Makefile index faabd45fdb..5b34b5c225 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -215,6 +215,7 @@ CFLAGS-recvmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-close.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-read.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-write.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c = -fexceptions diff --git a/sysdeps/unix/sysv/linux/write.c b/sysdeps/unix/sysv/linux/write.c new file mode 100644 index 0000000000..d49514502e --- /dev/null +++ b/sysdeps/unix/sysv/linux/write.c @@ -0,0 +1,33 @@ +/* Linux write syscall implementation. + Copyright (C) 2017 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 + . */ + +#include +#include + +/* Write NBYTES of BUF to FD. Return the number written, or -1. */ +ssize_t +__libc_write (int fd, const void *buf, size_t nbytes) +{ + return SYSCALL_CANCEL (write, fd, buf, nbytes); +} +libc_hidden_def (__libc_write) + +weak_alias (__libc_write, __write) +libc_hidden_weak (__write) +weak_alias (__libc_write, write) +libc_hidden_weak (write) -- 2.11.4.GIT