From patchwork Wed Feb 27 21:30:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1049155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-100311-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="j/8yC+05"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 448pl55dCDz9s5c for ; Thu, 28 Feb 2019 08:30:57 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=sn9 ZsIanVu1KP3ryOnzzoVS7orEwqldKKzIZ0QLCHpozwIKQiaxykGbwu7GdWql4g+b pSc4mBr/GeFvWl+lsIx+I3dnZvym2ilisE8lqD5lFTti4bNwOkP1GaN4uUxOWFpf LxYdQ9FZ/s0q2b+gnpYKU0UNTB7rbYu+Ha7oYNKU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=CM+NC9p5X m9JegdRMf1o5/V8La0=; b=j/8yC+05aPPBD9M6wQCwUeOrWSQ0CFoeMnTSoGFuH VOBtUjg/ta6XGysbuYrYH2N+fD9GTwdHA2IOnIWLHgMrujoh55w2Q5HCMImw2v+6 C53lEiPzIKn158a4VJ7OM97LXq7mxnDbIltJett4X9I4Aw4GfAgcORVLzYbpumKI Q4= Received: (qmail 19925 invoked by alias); 27 Feb 2019 21:30:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 17980 invoked by uid 89); 27 Feb 2019 21:30:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=samuel, Samuel, distributed X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] hurd: Add renameat2 support for RENAME_NOREPLACE Date: Wed, 27 Feb 2019 13:30:25 -0800 Message-Id: <20190227213025.17336-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 * include/stdio.h (__renameat2): New hidden prototype. * stdio-common/renameat2.c (__renameat2): Add hidden definition. * sysdeps/mach/hurd/renameat.c (__renameat): Move implementation to... * sysdeps/mach/hurd/renameat2.c (__renameat2): ... new function, and add support for RENAME_NOREPLACE. * sysdeps/unix/sysv/linux/renameat2.c (__renameat2): Add hidden definition. --- ChangeLog | 8 +++++ include/stdio.h | 2 ++ stdio-common/renameat2.c | 4 ++- sysdeps/mach/hurd/renameat.c | 21 +---------- sysdeps/mach/hurd/renameat2.c | 56 +++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/renameat2.c | 4 ++- 6 files changed, 73 insertions(+), 22 deletions(-) create mode 100644 sysdeps/mach/hurd/renameat2.c diff --git a/ChangeLog b/ChangeLog index de34cdd005..efe62c1dbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-02-27 Samuel Thibault + + * include/stdio.h (__renameat2): New hidden prototype. + * stdio-common/renameat2.c (__renameat2): Add hidden definition. + * sysdeps/mach/hurd/renameat.c (__renameat): Move implementation to... + * sysdeps/mach/hurd/renameat2.c (__renameat2): ... new function. + * sysdeps/unix/sysv/linux/renameat2.c (__renameat2): Add hidden definition. + 2019-02-27 Joseph Myers * hurd/hurdinit.c (_hurd_init): Use braces around empty body of an diff --git a/include/stdio.h b/include/stdio.h index 7d1877ea5e..5302e61024 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -261,6 +261,8 @@ __putc_unlocked (int __c, FILE *__stream) extern __typeof (renameat) __renameat; libc_hidden_proto (__renameat) +extern __typeof (renameat2) __renameat2; +libc_hidden_proto (__renameat2) # endif /* not _ISOMAC */ #endif /* stdio.h */ diff --git a/stdio-common/renameat2.c b/stdio-common/renameat2.c index ce60173455..00cb2ec6c5 100644 --- a/stdio-common/renameat2.c +++ b/stdio-common/renameat2.c @@ -20,7 +20,7 @@ #include int -renameat2 (int oldfd, const char *old, int newfd, const char *new, +__renameat2 (int oldfd, const char *old, int newfd, const char *new, unsigned int flags) { if (flags == 0) @@ -28,3 +28,5 @@ renameat2 (int oldfd, const char *old, int newfd, const char *new, __set_errno (EINVAL); return -1; } +libc_hidden_def (__renameat2) +weak_alias (__renameat2, renameat2) diff --git a/sysdeps/mach/hurd/renameat.c b/sysdeps/mach/hurd/renameat.c index 9aa231091c..a05f550a57 100644 --- a/sysdeps/mach/hurd/renameat.c +++ b/sysdeps/mach/hurd/renameat.c @@ -24,26 +24,7 @@ int __renameat (int oldfd, const char *old, int newfd, const char *new) { - error_t err; - file_t olddir, newdir; - const char *oldname, *newname; - - olddir = __directory_name_split_at (oldfd, old, (char **) &oldname); - if (olddir == MACH_PORT_NULL) - return -1; - newdir = __directory_name_split_at (newfd, new, (char **) &newname); - if (newdir == MACH_PORT_NULL) - { - __mach_port_deallocate (__mach_task_self (), olddir); - return -1; - } - - err = __dir_rename (olddir, oldname, newdir, newname, 0); - __mach_port_deallocate (__mach_task_self (), olddir); - __mach_port_deallocate (__mach_task_self (), newdir); - if (err) - return __hurd_fail (err); - return 0; + return __renameat2 (oldfd, old, newfd, new, 0); } libc_hidden_def (__renameat) weak_alias (__renameat, renameat) diff --git a/sysdeps/mach/hurd/renameat2.c b/sysdeps/mach/hurd/renameat2.c new file mode 100644 index 0000000000..2ed49cbac9 --- /dev/null +++ b/sysdeps/mach/hurd/renameat2.c @@ -0,0 +1,56 @@ +/* Rename a file using relative source and destination names. Hurd version. + Copyright (C) 1991-2019 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 +#include + +/* Rename the file OLD relative to OLDFD to NEW relative to NEWFD. */ +int +__renameat2 (int oldfd, const char *old, int newfd, const char *new, + unsigned int flags) +{ + error_t err; + file_t olddir, newdir; + const char *oldname, *newname; + int excl = 0; + + if (flags & (RENAME_EXCHANGE | RENAME_WHITEOUT)) + return __hurd_fail (ENOSYS); + if (flags & RENAME_NOREPLACE) + excl = 1; + + olddir = __directory_name_split_at (oldfd, old, (char **) &oldname); + if (olddir == MACH_PORT_NULL) + return -1; + newdir = __directory_name_split_at (newfd, new, (char **) &newname); + if (newdir == MACH_PORT_NULL) + { + __mach_port_deallocate (__mach_task_self (), olddir); + return -1; + } + + err = __dir_rename (olddir, oldname, newdir, newname, excl); + __mach_port_deallocate (__mach_task_self (), olddir); + __mach_port_deallocate (__mach_task_self (), newdir); + if (err) + return __hurd_fail (err); + return 0; +} +libc_hidden_def (__renameat2) +weak_alias (__renameat2, renameat2) diff --git a/sysdeps/unix/sysv/linux/renameat2.c b/sysdeps/unix/sysv/linux/renameat2.c index 566868cc93..a9cc2ea6b8 100644 --- a/sysdeps/unix/sysv/linux/renameat2.c +++ b/sysdeps/unix/sysv/linux/renameat2.c @@ -21,7 +21,7 @@ #include int -renameat2 (int oldfd, const char *old, int newfd, const char *new, +__renameat2 (int oldfd, const char *old, int newfd, const char *new, unsigned int flags) { #if !defined (__NR_renameat) || defined (__ASSUME_RENAMEAT2) @@ -42,3 +42,5 @@ renameat2 (int oldfd, const char *old, int newfd, const char *new, return -1; #endif } +libc_hidden_def (__renameat2) +weak_alias (__renameat2, renameat2)