From patchwork Thu Aug 31 20:34:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 22490 Received: (qmail 60030 invoked by alias); 31 Aug 2017 20:34:25 -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 60020 invoked by uid 89); 31 Aug 2017 20:34:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f173.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=TRM1kyMcyf9+MfNMeRD2nZvei9tmk2X+EkOEsFaC/4Y=; b=tMfx+ccvxngsRkSL67WBnyfAe8rVOVoGdZlZiHtIQB7GMGfOtvaU6SxkvCu5t2VaIC X/enObdpqWRKcX+ctY5gp9na+8Qbxb+kfcOBfqoeKAhoXo3dTorKP2jUOk1b79TWipc4 YHuF7dsuYjUtN3hH+Y0muBzqU62Xp0MgN/ttRDa8uJvagLGjbpd6YjtcgDkgKutP1H0a ZC7JA3QEAZneAzwiqvQuqz1boxYg05vmHzvBimLK6CAD5fGzWfncqFs254jZjik8RbaX aG0A0i7PmwAupL+sfHdbvFYwMGo0UbuwCglby1qFRR+AFAjZFzxY49YMBFkrZe4WoxRa xxjg== X-Gm-Message-State: AHYfb5hFGNe3BMNCOE8GBVyGgTrgoCMZLWpF4lE2ZYzald/moYxmGLzu j0XBU4oaCgK2RMRzJEIs6Q== X-Google-Smtp-Source: ADKCNb4nMgzMWGOFqYnaeRNO1Wml6LWcCOwnle7VkqXATXqNjypQim9+xnMh7hrTcNE07wy4e0zW7Q== X-Received: by 10.237.51.35 with SMTP id u32mr9059829qtd.207.1504211661559; Thu, 31 Aug 2017 13:34:21 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] linux: Implement tmpfile with O_TMPFILE (BZ#21530) Date: Thu, 31 Aug 2017 17:34:16 -0300 Message-Id: <1504211656-9263-1-git-send-email-adhemerval.zanella@linaro.org> This patch adds support to use O_TMPFILE on tmpfile on Linux. This is similar previous suggestion by Andreas Schwab [1] with the difference the file descriptor creation is parameterized to compartmentalize Linux only open flags (O_TMPFILE) on sysdep folder. Checked on x86_64-linux-gnu. Adhemerval Zanella Andreas Schwab [BZ #21530] * include/stdio.h (__gen_tempfd): New function. * stdio-common/Makefile (routines): Add gentempfd. * stdio-common/gentempfd.c: New file. * sysdeps/unix/sysv/linux/gentempfd.c: Likewise. * stdio-common/tmpfile.c (tmpfile): First try to use a system specific unnamed file first. [1] https://sourceware.org/ml/libc-alpha/2017-06/msg01293.html --- ChangeLog | 11 +++++++++++ include/stdio.h | 3 +++ stdio-common/Makefile | 2 +- stdio-common/gentempfd.c | 26 ++++++++++++++++++++++++++ stdio-common/tmpfile.c | 29 ++++++++++++++++++++--------- sysdeps/unix/sysv/linux/gentempfd.c | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 stdio-common/gentempfd.c create mode 100644 sysdeps/unix/sysv/linux/gentempfd.c diff --git a/include/stdio.h b/include/stdio.h index 509447c..87e0e10 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -191,5 +191,8 @@ libc_hidden_proto (__obstack_vprintf_chk) extern FILE * __fmemopen (void *buf, size_t len, const char *mode); libc_hidden_proto (__fmemopen) +extern int __gen_tempfd (int flags); +libc_hidden_proto (__gen_tempfd) + # endif /* not _ISOMAC */ #endif /* stdio.h */ diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 397e0c2..2c3c2e5 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -39,7 +39,7 @@ routines := \ flockfile ftrylockfile funlockfile \ isoc99_scanf isoc99_vscanf isoc99_fscanf isoc99_vfscanf isoc99_sscanf \ isoc99_vsscanf \ - psiginfo + psiginfo gentempfd aux := errlist siglist printf-parsemb printf-parsewc fxprintf diff --git a/stdio-common/gentempfd.c b/stdio-common/gentempfd.c new file mode 100644 index 0000000..d40c57d --- /dev/null +++ b/stdio-common/gentempfd.c @@ -0,0 +1,26 @@ +/* Generate a temporary file descriptor. Generic/POSIX version. + 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 + +int +__gen_tempfd (int flags) +{ + return -1; +} +libc_hidden_def (__gen_tempfd) diff --git a/stdio-common/tmpfile.c b/stdio-common/tmpfile.c index e6030be..3e35345 100644 --- a/stdio-common/tmpfile.c +++ b/stdio-common/tmpfile.c @@ -34,23 +34,34 @@ FILE * tmpfile (void) { - char buf[FILENAME_MAX]; int fd; FILE *f; - - if (__path_search (buf, FILENAME_MAX, NULL, "tmpf", 0)) - return NULL; int flags = 0; #ifdef FLAGS flags = FLAGS; #endif - fd = __gen_tempname (buf, 0, flags, __GT_FILE); + + /* First try a system specific method. */ + fd = __gen_tempfd (flags); + if (fd < 0) - return NULL; + { + char buf[FILENAME_MAX]; - /* Note that this relies on the Unix semantics that - a file is not really removed until it is closed. */ - (void) __unlink (buf); + if (__path_search (buf, sizeof buf, NULL, "tmpf", 0)) + return NULL; + + fd = __gen_tempname (buf, 0, flags, __GT_FILE); + if (fd < 0) + return NULL; + + /* Note that this relies on the Unix semantics that + a file is not really removed until it is closed. */ + (void) __unlink (buf); + } + + if (fd < 0) + return NULL; if ((f = __fdopen (fd, "w+b")) == NULL) __close (fd); diff --git a/sysdeps/unix/sysv/linux/gentempfd.c b/sysdeps/unix/sysv/linux/gentempfd.c new file mode 100644 index 0000000..902cbe2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/gentempfd.c @@ -0,0 +1,34 @@ +/* Generate a temporary file descriptor. Linux version. + 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 +#include + +int +__gen_tempfd (int flags) +{ + int fd = __open (P_tmpdir, O_RDWR | O_TMPFILE | O_EXCL | flags, + S_IRUSR | S_IWUSR); + if (fd < 0 && errno == ENOENT && strcmp (P_tmpdir, "/tmp") != 0) + fd = __open ("/tmp", O_RDWR | O_TMPFILE | O_EXCL | flags, + S_IRUSR | S_IWUSR); + + return fd; +} +libc_hidden_def (__gen_tempfd)