From patchwork Thu Jun 14 15:01:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 27851 Received: (qmail 109870 invoked by alias); 14 Jun 2018 15:02:00 -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 109851 invoked by uid 89); 14 Jun 2018 15:02:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=arq X-HELO: mail-qt0-f195.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=mFo2i38juwJmBhH2O02/mZqtK7wOFXZuw5zYMID+jGg=; b=YdSby/Vg8fAiA91IRVlXawqLgbhajwfnqpOEPMOywEMWA/0JHaibpzLc9fvmVYrvLA T2Pe6Cfs+AHtnfs7vJR25ODfnb+uBM0csWMxOffXwdbukEOYft7rYP+WFFjOZ5IvN9lJ v3tHd/dOt6VMU0+y+SVvFcd+Jp34wdtZAcyNZ5ecpY4KRGSAzXKrF39duwIraRC7LEVd k9QwfmX7scKVtu8sOeTlNKg6eONE2RsBlc9YRCLQ0znPv6LdtPPywSoel30DBloVoOLr cWBzTkHxXlcT6U2f7yTKTb8nw0Uk9CXjy0E1gM4O6xFmk1p7oNCut+HYqjy7vQLKfM4L 9X1w== X-Gm-Message-State: APt69E0EvV4RJqjREqGponNOQ33rSTz0fqmyl7G0LHXNgFLVHy4zfMg0 7GUlK8+ElHrOXmRToi8jNDNwFjyPYNQ= X-Google-Smtp-Source: ADUXVKKh3kZTDLwUNaok4b35XAJRugx9abBy4t1DFtiNewTOtiZmMk5/gWhXN6mEbQ/45vPiw5vo7g== X-Received: by 2002:aed:37c2:: with SMTP id j60-v6mr2670339qtb.417.1528988513793; Thu, 14 Jun 2018 08:01:53 -0700 (PDT) Subject: Re: [PATCH v2] libio: Flush stream at freopen (BZ#21037) To: Andreas Schwab Cc: libc-alpha@sourceware.org References: <1528925590-29895-1-git-send-email-adhemerval.zanella@linaro.org> From: Adhemerval Zanella Openpgp: preference=signencrypt Message-ID: <25a001ee-301f-1af5-20ed-27b883500f04@linaro.org> Date: Thu, 14 Jun 2018 12:01:47 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: On 14/06/2018 10:20, Andreas Schwab wrote: > On Jun 13 2018, Adhemerval Zanella wrote: > >> * libio/tst-memstream.h (FPUTS): New macro. > > That file doesn't exist yet. Where does it come from? > > Andreas. > Bacause I rebased against a wrong branch. Below it is an updated patch (which I fixed some copyright dates as well). --- * libio/Makefile (tests): Add tst-memstream4 and tst-wmemstream4. * libio/freopen.c (freopen): Sync stream before reopen and adjust to new fd_to_filename interface. * libio/freopen64.c (freopen64): Likewise. * libio/tst-memstream.h: New file. * libio/tst-memstream4.c: Likewise. * libio/tst-wmemstream4.c: Likewise. * sysdeps/generic/fd_to_filename.h (fd_to_filename): Change signature. * sysdeps/unix/sysv/linux/fd_to_filename.h (fd_to_filename): Likewise and remove internal dynamic allocation. --- diff --git a/libio/Makefile b/libio/Makefile index cbe14a8..077bd40 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -59,8 +59,8 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \ tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \ tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \ bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2 \ - tst-memstream1 tst-memstream2 tst-memstream3 \ - tst-wmemstream1 tst-wmemstream2 tst-wmemstream3 \ + tst-memstream1 tst-memstream2 tst-memstream3 tst-memstream4 \ + tst-wmemstream1 tst-wmemstream2 tst-wmemstream3 tst-wmemstream4 \ bug-memstream1 bug-wmemstream1 \ tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \ tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \ diff --git a/libio/freopen.c b/libio/freopen.c index abf19e9..fa63429 100644 --- a/libio/freopen.c +++ b/libio/freopen.c @@ -24,28 +24,38 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#include "libioP.h" -#include "stdio.h" +#include #include #include #include -#include +#include #include - -#include +#include FILE * freopen (const char *filename, const char *mode, FILE *fp) { - FILE *result; + FILE *result = NULL; + char fdfilename[30]; + CHECK_FILE (fp, NULL); - if (!(fp->_flags & _IO_IS_FILEBUF)) - return NULL; + _IO_acquire_lock (fp); + /* First flush the stream (failure should be ignored). */ + _IO_SYNC (fp); + + if (!(fp->_flags & _IO_IS_FILEBUF)) + goto end; + int fd = _IO_fileno (fp); - const char *gfilename = (filename == NULL && fd >= 0 - ? fd_to_filename (fd) : filename); + const char *gfilename; + if (filename == NULL && fd >= 0) + gfilename = fd_to_filename (fd, fdfilename, sizeof fdfilename) + ? fdfilename : NULL; + else + gfilename = filename; + fp->_flags2 |= _IO_FLAGS2_NOCLOSE; #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) if (&_IO_stdin_used == NULL) @@ -101,9 +111,6 @@ freopen (const char *filename, const char *mode, FILE *fp) __close (fd); end: - if (filename == NULL) - free ((char *) gfilename); - _IO_release_lock (fp); return result; } diff --git a/libio/freopen64.c b/libio/freopen64.c index ea7ebd3..1daeba6 100644 --- a/libio/freopen64.c +++ b/libio/freopen64.c @@ -24,27 +24,37 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#include "libioP.h" -#include "stdio.h" +#include #include #include #include +#include #include -#include - FILE * freopen64 (const char *filename, const char *mode, FILE *fp) { - FILE *result; + FILE *result = NULL; + char fdfilename[30]; + CHECK_FILE (fp, NULL); - if (!(fp->_flags & _IO_IS_FILEBUF)) - return NULL; + _IO_acquire_lock (fp); + /* First flush the stream (failure should be ignored). */ + _IO_SYNC (fp); + + if (!(fp->_flags & _IO_IS_FILEBUF)) + goto end; + int fd = _IO_fileno (fp); - const char *gfilename = (filename == NULL && fd >= 0 - ? fd_to_filename (fd) : filename); + const char *gfilename; + if (filename == NULL && fd >= 0) + gfilename = fd_to_filename (fd, fdfilename, sizeof fdfilename) + ? fdfilename : NULL; + else + gfilename = filename; + fp->_flags2 |= _IO_FLAGS2_NOCLOSE; _IO_file_close_it (fp); _IO_JUMPS_FILE_plus (fp) = &_IO_file_jumps; @@ -84,8 +94,6 @@ freopen64 (const char *filename, const char *mode, FILE *fp) __close (fd); end: - if (filename == NULL) - free ((char *) gfilename); _IO_release_lock (fp); return result; } diff --git a/libio/tst-memstream.h b/libio/tst-memstream.h new file mode 100644 index 0000000..b9b02bd --- /dev/null +++ b/libio/tst-memstream.h @@ -0,0 +1,68 @@ +/* Common definitions for open_memstream tests. + Copyright (C) 2018 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 +#include +#include +#include + +#include + +#ifdef TEST_WCHAR +# include + +/* Straighforward implementation so tst-memstream3 could use check + fwrite on open_memstream. */ +static size_t __attribute__ ((used)) +fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq) +{ + const wchar_t *wcs = (const wchar_t*) (ptr); + for (size_t s = 0; s < size; s++) + { + for (size_t n = 0; n < nmemb; n++) + if (fputwc (wcs[n], arq) == WEOF) + return n; + } + return size * nmemb; +} + +# define CHAR_T wchar_t +# define W(o) L##o +# define OPEN_MEMSTREAM open_wmemstream +# define PRINTF wprintf +# define FWRITE fwwrite +# define FPUTC fputwc +# define FPUTS fputws +# define STRCMP wcscmp +# define STRLEN wcslen +#else +# define CHAR_T char +# define W(o) o +# define OPEN_MEMSTREAM open_memstream +# define PRINTF printf +# define FWRITE fwrite +# define FPUTC fputc +# define FPUTS fputs +# define STRCMP strcmp +# define STRLEN strlen +#endif + +#define S(s) S1 (s) +#define S1(s) #s diff --git a/libio/tst-memstream4.c b/libio/tst-memstream4.c new file mode 100644 index 0000000..43082f1 --- /dev/null +++ b/libio/tst-memstream4.c @@ -0,0 +1,62 @@ +/* Test for open_memstream BZ #21037. + Copyright (C) 2018 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 "tst-memstream.h" + +static void +mcheck_abort (enum mcheck_status ev) +{ + printf ("mecheck failed with status %d\n", (int) ev); + exit (1); +} + +static int +do_test (void) +{ + mcheck_pedantic (mcheck_abort); + + /* Check if freopen proper fflush the stream. */ + { + CHAR_T old[] = W("old"); + CHAR_T *buf = old; + size_t size; + + FILE *fp = OPEN_MEMSTREAM (&buf, &size); + TEST_VERIFY_EXIT (fp != NULL); + + FPUTS (W("new"), fp); + /* The stream buffer pointer should be updated with only a fflush or + fclose. */ + TEST_VERIFY (STRCMP (buf, old) == 0); + + /* The old stream should be fflush the stream, even for an invalid + streams. */ + FILE *nfp = freopen ("invalid-file", "r", fp); + TEST_VERIFY (nfp == NULL); + + TEST_VERIFY (STRCMP (buf, W("new")) == 0); + + TEST_VERIFY (fclose (fp) == 0); + + free (buf); + } + + return 0; +} + +#include diff --git a/libio/tst-wmemstream4.c b/libio/tst-wmemstream4.c new file mode 100644 index 0000000..8ff146e --- /dev/null +++ b/libio/tst-wmemstream4.c @@ -0,0 +1,20 @@ +/* Test for open_wmemstream BZ #21037. + Copyright (C) 2018 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 + . */ + +#define TEST_WCHAR +#include diff --git a/sysdeps/generic/fd_to_filename.h b/sysdeps/generic/fd_to_filename.h index bacfe5b..c60be86 100644 --- a/sysdeps/generic/fd_to_filename.h +++ b/sysdeps/generic/fd_to_filename.h @@ -18,8 +18,8 @@ /* In general there is no generic way to query filename for an open file descriptor. */ -static inline const char * -fd_to_filename (int fd) +static inline bool +fd_to_filename (int fd, char *buf, size_t len) { - return NULL; + return false; } diff --git a/sysdeps/unix/sysv/linux/fd_to_filename.h b/sysdeps/unix/sysv/linux/fd_to_filename.h index 297716b..8381f6d 100644 --- a/sysdeps/unix/sysv/linux/fd_to_filename.h +++ b/sysdeps/unix/sysv/linux/fd_to_filename.h @@ -16,30 +16,17 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#include #include -#include <_itoa.h> -static inline const char * -fd_to_filename (int fd) +static inline bool +fd_to_filename (int fd, char *buf, size_t len) { - char *ret = malloc (30); + __snprintf (buf, len, "/proc/self/fd/%d", fd); - if (ret != NULL) - { - struct stat64 st; - - *_fitoa_word (fd, __stpcpy (ret, "/proc/self/fd/"), 10, 0) = '\0'; - - /* We must make sure the file exists. */ - if (__lxstat64 (_STAT_VER, ret, &st) < 0) - { - /* /proc is not mounted or something else happened. Don't - return the file name. */ - free (ret); - ret = NULL; - } - } - return ret; + /* We must make sure the file exists. */ + if (__lxstat64 (_STAT_VER, buf, & (struct stat64) {}) < 0) + /* /proc is not mounted or something else happened. */ + return false; + return true; }