OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++/71038 fix error checks in filesystem::copy_file 

PR libstdc++/71038
	* src/filesystem/ops.cc (do_copy_file): Fix backwards conditions.
	* testsuite/experimental/filesystem/operations/copy_file.cc: New test.

From-SVN: r236084
This commit is contained in:
Jonathan Wakely 2016-05-10 16:39:14 +01:00 committed by Jonathan Wakely
parent 4b59d19ffd
commit 6fe673ad0f
3 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,9 @@
2016-05-10 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/71038
* src/filesystem/ops.cc (do_copy_file): Fix backwards conditions.
* testsuite/experimental/filesystem/operations/copy_file.cc: New test.
* include/experimental/bits/fs_dir.h (__directory_iterator_proxy):
Overload operator* to move from rvalues.

2
libstdc++-v3/src/filesystem/ops.cc
View File

@ -450,7 +450,7 @@ namespace
ec = std::make_error_code(std::errc::io_error);
return false;
}
if (sbout.close() || sbin.close())
if (!sbout.close() || !sbin.close())
{
ec.assign(errno, std::generic_category());
return false;

82
libstdc++-v3/testsuite/experimental/filesystem/operations/copy_file.cc Normal file
View File

@ -0,0 +1,82 @@
// Copyright (C) 2016 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This 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 General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++11 -lstdc++fs" }
// { dg-require-filesystem-ts "" }
// 15.4 Copy [fs.op.copy_file]
#include <experimental/filesystem>
#include <fstream>
#include <testsuite_fs.h>
#include <testsuite_hooks.h>
void
test01()
{
bool test __attribute__((unused)) = false;
using std::experimental::filesystem::copy_options;
std::error_code ec;
auto from = __gnu_test::nonexistent_path();
auto to = __gnu_test::nonexistent_path();
// test non-existent file
bool b = copy_file(from, to, ec);
VERIFY( !b );
VERIFY( ec );
VERIFY( !exists(to) );
// test empty file
std::ofstream{from.native()};
VERIFY( exists(from) );
VERIFY( file_size(from) == 0 );
b = copy_file(from, to);
VERIFY( b );
VERIFY( exists(to) );
VERIFY( file_size(to) == 0 );
remove(to);
VERIFY( !exists(to) );
b = copy_file(from, to, copy_options::none, ec);
VERIFY( b );
VERIFY( !ec );
VERIFY( exists(to) );
VERIFY( file_size(to) == 0 );
std::ofstream{from.native()} << "Hello, filesystem!";
VERIFY( file_size(from) != 0 );
remove(to);
VERIFY( !exists(to) );
b = copy_file(from, to);
VERIFY( b );
VERIFY( exists(to) );
VERIFY( file_size(to) == file_size(from) );
remove(to);
VERIFY( !exists(to) );
b = copy_file(from, to);
VERIFY( b );
VERIFY( !ec );
VERIFY( exists(to) );
VERIFY( file_size(to) == file_size(from) );
}
int
main()
{
test01();
}