Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r58226 - in sandbox/filesystem-v3: boost/filesystem libs/filesystem/doc libs/filesystem/src libs/filesystem/test libs/filesystem/test/msvc
From: bdawes_at_[hidden]
Date: 2009-12-07 14:52:18

Next message: daniel_james_at_[hidden]: "[Boost-commit] svn:boost r58227 - in website/public_html/live/feed: . history"
Previous message: daniel_james_at_[hidden]: "[Boost-commit] svn:boost r58225 - trunk/boost/iostreams/detail"

Author: bemandawes
Date: 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
New Revision: 58226
URL: http://svn.boost.org/trac/boost/changeset/58226

Log:
rename() specs now same as POSIX; fix #2866, but for V3 only
Text files modified:
   sandbox/filesystem-v3/boost/filesystem/operations.hpp | 8
   sandbox/filesystem-v3/libs/filesystem/doc/reference.html | 175 +++++++++++++++++++++++----------------
   sandbox/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp | 1
   sandbox/filesystem-v3/libs/filesystem/src/operations.cpp | 24 +---
   sandbox/filesystem-v3/libs/filesystem/test/msvc/filesystem-v3-sandbox.sln | 50 +++++++++++
   sandbox/filesystem-v3/libs/filesystem/test/operations_test.cpp | 37 +++++---
   sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp | 2
   7 files changed, 188 insertions(+), 109 deletions(-)

Modified: sandbox/filesystem-v3/boost/filesystem/operations.hpp
==============================================================================
--- sandbox/filesystem-v3/boost/filesystem/operations.hpp (original)
+++ sandbox/filesystem-v3/boost/filesystem/operations.hpp 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
@@ -195,7 +195,7 @@
     BOOST_FILESYSTEM_DECL
     boost::uintmax_t remove_all(const path& p, system::error_code* ec=0);
     BOOST_FILESYSTEM_DECL
- void rename(const path& from, const path& to, system::error_code* ec=0);
+ void rename(const path& old_p, const path& new_p, system::error_code* ec=0);
     BOOST_FILESYSTEM_DECL
     void resize_file(const path& p, uintmax_t size, system::error_code* ec=0);
     BOOST_FILESYSTEM_DECL
@@ -422,11 +422,11 @@
   boost::uintmax_t remove_all(const path& p, system::error_code& ec)
                                        {return detail::remove_all(p, &ec);}
   inline
- void rename(const path& from, const path& to) {detail::rename(from, to);}
+ void rename(const path& old_p, const path& new_p) {detail::rename(old_p, new_p);}

   inline
- void rename(const path& from, const path& to, system::error_code& ec)
- {detail::rename(from, to, &ec);}
+ void rename(const path& old_p, const path& new_p, system::error_code& ec)
+ {detail::rename(old_p, new_p, &ec);}
   inline // name suggested by Scott McMurray
   void resize_file(const path& p, uintmax_t size) {detail::resize_file(p, size);}

Modified: sandbox/filesystem-v3/libs/filesystem/doc/reference.html
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/doc/reference.html (original)
+++ sandbox/filesystem-v3/libs/filesystem/doc/reference.html 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
@@ -90,9 +90,9 @@
   &nbsp create_hard_link 
   &nbsp create_symlink 
   &nbsp current_path 
-   &nbsp exists 
+   &nbsp exists 
   &nbsp equivalent 
-   &nbsp file_size 
+   &nbsp file_size 
   &nbsp initial_path 
   &nbsp is_directory 
   &nbsp is_empty 
@@ -2141,16 +2141,16 @@
<pre>uintmax_t <a name="file_size">file_size</a>(const path& p);
uintmax_t <a name="file_size">file_size</a>(const path& p, system::error_code& ec);</pre>
<blockquote>
- Returns: The size
+ Remarks: 
+ Returns: If <code>exists(p) && is_regular_file(p)</code>, the size
 in bytes
 of the file <code>p</code> resolves to, determined as if by the value of
 the POSIX <code>
 <a href="http://www.opengroup.org/onlinepubs/000095399/basedefs/sys/stat.h.html">stat</a></code> structure member <code>st_size</code>
 obtained as if by POSIX <code>
- stat()</code>.
- Throws: <code>filesystem_error</code>
- if <code>!exists(p) || !is_regular_file(p)</code>,
- otherwise as specified in
+ stat()</code>.
+ Otherwise, <code>static_cast<uintmax_t>(-1)</code>.
+ Throws: As specified in
 <a href="file:///C:/boost/filesystem-v3-sandbox/libs/filesystem/doc/reference.html#Error-reporting">
 Error reporting</a>.
</blockquote>
@@ -2204,13 +2204,29 @@
 <code>s.type() == regular_file</code>
 Throws: Nothing.
</blockquote>
-<pre><code>bool <a name="is_regular_file2">is_regular_file</a>(const path& p);
-bool <a name="is_regular_file2">is_regular_file</a>(const path& p, system::error_code& ec);</code></pre>
+<pre><code>bool <a name="is_regular_file2">is_regular_file</a>(const path& p);</code></pre>
<blockquote>
- Returns: <code>is_regular_file(status(p))</code> or <code>is_regular_file(status(p, ec))</code>,
- respectively.
- Throws: <code>filesystem_error</code>; overload with <code>error_code&</code> throws
- nothing.
+ Returns: <code>is_regular_file(status(p))</code>.
+ Throws: <code>filesystem_error</code>
+ if <code>status(p)</code> would throw <code>filesystem_error.</code>
+ </blockquote>
+<pre><code>bool <a name="is_regular_file2">is_regular_file</a>(const path& p, system::error_code& ec);</code></pre>
+<blockquote>
+ Effects: Sets <code>ec</code> as if by <code>status(p, ec)</code>.
+ [Note:
+ 
+ <code>status_error</code>,
+ 
+ <code>file_not_found</code>
+ and 
+ <code>type_unknown</code>
+ cases set <code>ec</code>
+ to error values. To distinguish between cases, call the <code>
+ status</code>
+ function directly. -- end
+ note] 
+ Returns: <code>is_regular_file(status(p, ec))</code>.
+ Throws: Nothing.
</blockquote>
<pre>bool <a name="is_other">is_other</a>(file_status s);</pre>
<blockquote>
@@ -2301,22 +2317,20 @@
 <a href="file:///C:/boost/filesystem-v3-sandbox/libs/filesystem/doc/reference.html#Error-reporting">
 Error reporting</a>.
</blockquote>
-<pre>void <a name="rename">rename</a>(const path& from, const path& to);
-void <a name="rename">rename</a>(const path& from, const path& to, system::error_code& ec);</pre>
+<pre>void <a name="rename">rename</a>(const path& old_p, const path& new_p);
+void <a name="rename">rename</a>(const path& old_p, const path& new_p, system::error_code& ec);</pre>
<blockquote>
- Effects: Renames <code>from</code> to <code>to</code>, as if by
+ Effects: Renames <code>old_p</code> to <code>new_p</code>, as if by
 POSIX <code>
 <a href="http://www.opengroup.org/onlinepubs/000095399/functions/rename.html">
 rename()</a></code>.
 <blockquote>
- [Note: If <code>from</code> and <code>to</code> resolve to the
- same file, no action is taken. Otherwise, if <code>to</code> resolves to an
- existing file, it is removed. A symbolic link is itself renamed, rather than
+ [Note: If <code>old_p</code> and <code>new_p</code> resolve to the
+ same existing file, no action is taken. Otherwise, if <code>new_p</code> resolves to an
+ existing non-directory file, it is removed, while if <code>new_p</code> resolves to an
+ existing directory, it is removed if empty on POSIX but is an error on Windows. A symbolic link is itself renamed, rather than
 the file it resolves to being renamed. -- end note]
 </blockquote>
- Postconditions: <code>!exists(from) && exists(to)</code>, and
- the contents and attributes of the file originally named <code>from</code>
- are otherwise unchanged.
 Throws: As specified in
 <a href="file:///C:/boost/filesystem-v3-sandbox/libs/filesystem/doc/reference.html#Error-reporting">
 Error reporting</a>.
@@ -2351,27 +2365,39 @@
 <a href="file:///C:/boost/filesystem-v3-sandbox/libs/filesystem/doc/reference.html#Error-reporting">
 Error reporting</a>.
</blockquote>
-<pre>file_status <a name="status">status</a>(const path& p);
-file_status <a name="status">status</a>(const path& p, system::error_code& ec);</pre>
+<pre>file_status <a name="status">status</a>(const path& p);</pre>
+<blockquote>
+ Effects: As if:
+ <blockquote>
+ <pre>system::error_code ec;
+file_status result = status(p, ec);
+if (result == status_error)
+ throw filesystem_error(implementation-supplied-message, p, ec);
+return result;</pre>
+ </blockquote>
+ Returns: See above.
+ Throws: <code>filesystem_error</code>.
+[Note: <code>result</code> values of <code>
+ file_status(file_not_found)</code>and <code>
+ file_status(type_unknown)</code> are not considered failures and do not
+ cause an exception to be
+thrown. -- end note] 
+ </blockquote>
+<pre>file_status <a name="status">status</a>(const path& p, system::error_code& ec);</pre>
<blockquote>
 Effects: 
 <blockquote>
- Determines the attributes
- of
- <code>p</code> as if by POSIX <code>
+ If possible, determines the attributes
+ of the file
+ <code>p</code> resolves to, as if by POSIX <code>
 <a href="http://www.opengroup.org/onlinepubs/000095399/functions/stat.html">stat()</a></code>.
 [Note: If a symbolic link is encountered during pathname
 resolution,
 pathname resolution continues using the contents of the symbolic link. --
 end note]
- For the <code>error_code&</code> overload:
- <ul>
- <li>If, during attribute determination, the underlying file system API reports no error, <code>ec.clear()</code>. 
- </li>
- <li>Otherwise, <code>ec</code> is set according to the error reported by
- the underlying file system API.</li>
- </ul>
- <blockquote>
+ If, during attribute determination, the underlying file system API reports
+ an error, sets <code>ec</code> to indicate the specific error reported.
+ Otherwise, <code>ec.clear()</code>.<blockquote>
 [Note: This allows users to inspect the specifics of underlying
 API errors even when the value returned by <code>status()</code> is not <code>
 file_status(status_error)</code>.  --end note]
@@ -2379,58 +2405,69 @@
 </blockquote>
 Returns:
 <blockquote>
- If the underlying file system API reported an error during attribute determination:
+ If <code>ec != error_code()</code>:
 <ul>
- <li>If the error indicated that <code>p</code> could not be resolved, as
- if by POSIX errors ENOENT or ENOTDIR, return <code>
- file_status(file_not_found)</code>. [Note: Windows equivalents
+ <li>If the specific error indicates that <code>p</code> cannot be resolved
+ because some element of the path does not exist, return <code>
+ file_status(file_not_found)</code>. [Note: POSIX errors that
+ indicate this are ENOENT or ENOTDIR. Windows equivalents
 include ERROR_FILE_NOT_FOUND, ERROR_PATH_NOT_FOUND, ERROR_INVALID_NAME,
 ERROR_INVALID_PARAMETER, ERROR_BAD_PATHNAME, and ERROR_BAD_NETPATH. --
 end note] 
 </li>
- <li>Otherwise, if the error indicates that <code>p</code> can be resolved
+ <li>Otherwise, if the specific error indicates that <code>p</code> can be resolved
 but the attributes cannot be determined, return <code>
 file_status(type_unknown)</code>. [Note: For example, Windows
- ERROR_SHARING_VIOLATION errors. The case never arises on POSIX. -- end
+ ERROR_SHARING_VIOLATION errors. For POSIX, the case never arises. -- end
 note] 
 </li>
- <li>Otherwise, for the overload without <code>error_code&</code>,
- throw an exception of type <code>filesystem_error</code>. 
- </li>
 <li>Otherwise, return <code>
 file_status(status_error)</code>.</li>
 </ul>
+ <blockquote>
 [Note: These semantics distinguish between
- <code>p</code> being known not to exist and not being able to determine the status of <code>p</code>. The
- distinction is important to some users.  --end note]
+ <code>p</code> being known not to exist,
+ <code>p</code> existing but not being able to determine its attributes,
+ and there being an error that prevents even knowing if
+ <code>p</code> exists. These
+ distinctions are important to some use cases. --end note]
+ </blockquote>
 Otherwise,
 <ul>
- <li>If the attributes indicate a regular file, as if by POSIX S_ISREG(),
+ <li>If the attributes indicate a regular file, as if by POSIX S_ISREG(),
 return <code>
- file_status(regular_file)</code>. 
+ file_status(regular_file)</code>. [Note: <code>
+regular_file</code> implies appropriate <code><fstream></code> operations
+ would succeed, assuming no hardware, permission, access, or race condition
+ errors. Lack of
+<code>regular_file</code> does not necessarily imply <code><fstream></code> operations would
+fail on a directory.
+-- end note] 
 </li>
- <li>Otherwise, if the attributes indicate a directory, as if by POSIX S_ISDIR(),
+ <li>Otherwise, if the attributes indicate a directory, as if by POSIX
+ S_ISDIR(),
 return <code>
- file_status(directory_file)</code>. 
+ file_status(directory_file)</code>. [Note: <code>directory_file</code> implies <code>
+directory_iterator(p)</code>would succeed.
+-- end note] 
 </li>
- <li>Otherwise, if the attributes indicate a symbolic link, as if by POSIX S_ISLNK(),
- return <code>
- file_status(symlink_file)</code>. [Note: Only possible for <code>
- symlink_status</code>. --end note] 
- </li>
- <li>Otherwise, if the attributes indicate a block special file, as if by POSIX S_ISBLK(),
+ <li>Otherwise, if the attributes indicate a block special file, as if by POSIX
+ S_ISBLK(),
 return <code>
 file_status(block_file)</code>. 
 </li>
- <li>Otherwise, if the attributes indicate a character special file, as if by POSIX S_ISCHR(),
+ <li>Otherwise, if the attributes indicate a character special file, as if by POSIX
+ S_ISCHR(),
 return <code>
 file_status(character_file)</code>. 
 </li>
- <li>Otherwise, if the attributes indicate a fifo or pipe file, as if by POSIX S_ISFIFO(),
+ <li>Otherwise, if the attributes indicate a fifo or pipe file, as if by POSIX
+ S_ISFIFO(),
 return <code>
 file_status(fifo_file)</code>. 
 </li>
- <li>Otherwise, if the attributes indicate a socket, as if by POSIX S_ISSOCK(),
+ <li>Otherwise, if the attributes indicate a socket, as if by POSIX
+ S_ISSOCK(),
 return <code>
 file_status(socket_file)</code>. 
 </li>
@@ -2438,16 +2475,7 @@
 file_status(type_unknown)</code>.</li>
 </ul>
 </blockquote>
-[Note: <code>directory_file</code> implies <code>
-directory_iterator(p)</code>would succeed, and <code>
-regular_file</code> implies appropriate <code><fstream></code> operations would succeed,
-assuming no hardware, permission, access, or race
-condition errors. For <code>regular_file,</code> the converse is not true; lack of
-<code>regular_file</code> does not necessarily imply <code><fstream></code> operations would
-fail on a directory.
--- end note]
-Throws: <code>filesystem_error</code>; overload with <code>error_code&</code> throws
-nothing.
+Throws: Nothing.
</blockquote>
<pre>bool <a name="status_known">status_known</a>(file_status s);</pre>
<blockquote>
@@ -2455,8 +2483,8 @@
 <code>s.type() != status_error</code>
 Throws: Nothing.
</blockquote>
-<pre>file_status <a name="symlink_status">symlink_status</a>(const path& p);
-file_status <a name="symlink_status">symlink_status</a>(const path& p, system::error_code& ec);</pre>
+<pre>file_status <a name="symlink_status">symlink_status</a>(const path& p);
+file_status <a name="symlink_status">symlink_status</a>(const path& p, system::error_code& ec);</pre>
<blockquote>
 Effects:  Same as status(), above,
 except that the attributes
@@ -2470,7 +2498,8 @@
 [Note: Pathname resolution is complete if <code>p</code> names a symbolic link. --
 end note]
 </blockquote>
- Returns: Same as status(), above.
+ Returns: Same as status(), above,
+ except ....
Throws: <code>filesystem_error</code>; overload with <code>error_code&</code> throws
nothing.
</blockquote>
@@ -3265,7 +3294,7 @@
Distributed under the Boost Software License, Version 1.0. See
<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>
Revised
-23 November 2009
+06 December 2009

</body>

Modified: sandbox/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp (original)
+++ sandbox/filesystem-v3/libs/filesystem/src/codecvt_error_category.cpp 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
@@ -18,6 +18,7 @@
#include <boost/filesystem/config.hpp>
#include <boost/filesystem/path_traits.hpp>
#include <boost/system/error_code.hpp>
+#include <locale>
#include <vector>
#include <cstdlib>
#include <cassert>

Modified: sandbox/filesystem-v3/libs/filesystem/src/operations.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/src/operations.cpp (original)
+++ sandbox/filesystem-v3/libs/filesystem/src/operations.cpp 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
@@ -135,7 +135,7 @@
# define BOOST_COPY_DIRECTORY(F,T)(!(::stat(from.c_str(), &from_stat)!= 0\
          || ::mkdir(to.c_str(),from_stat.st_mode)!= 0))
# define BOOST_COPY_FILE(F,T,FailIfExistsBool)copy_file_api(F, T, FailIfExistsBool)
-# define BOOST_MOVE_FILE(F,T)(::rename(F, T)== 0)
+# define BOOST_MOVE_FILE(OLD,NEW)(::rename(OLD, NEW)== 0)
# define BOOST_RESIZE_FILE(P,SZ)(::truncate(P, SZ)== 0)

# define BOOST_ERROR_NOT_SUPPORTED ENOSYS
@@ -153,7 +153,7 @@
# define BOOST_DELETE_FILE(P)(::DeleteFileW(P)!= 0)
# define BOOST_COPY_DIRECTORY(F,T)(::CreateDirectoryExW(F, T, 0)!= 0)
# define BOOST_COPY_FILE(F,T,FailIfExistsBool)(::CopyFileW(F, T, FailIfExistsBool)!= 0)
-# define BOOST_MOVE_FILE(F,T)(::MoveFileW(F, T)!= 0)
+# define BOOST_MOVE_FILE(OLD,NEW)(::MoveFileExW(OLD, NEW, MOVEFILE_REPLACE_EXISTING)!= 0)
# define BOOST_RESIZE_FILE(P,SZ)(resize_file_api(P, SZ)!= 0)
# define BOOST_READ_SYMLINK(P,T)

@@ -1088,7 +1088,7 @@
       {
         if (ec == 0)
           throw_exception(filesystem_error("boost::filesystem::read_symlink",
- p, errno, system_category));
+ p, error_code(errno, system_category)));
         else ec->assign(errno, system_category);
         break;
       }
@@ -1132,19 +1132,9 @@
   }

   BOOST_FILESYSTEM_DECL
- void rename(const path& from, const path& to, error_code* ec)
+ void rename(const path& old_p, const path& new_p, error_code* ec)
   {
-# ifdef BOOST_POSIX_API
-
- // POSIX is too permissive so must check
- error_code dummy;
- if (error(fs::exists(to, dummy),
- error_code(EEXIST, system_category),
- from, to, ec, "boost::filesystem::rename"))
- return;
-# endif
-
- error(!BOOST_MOVE_FILE(from.c_str(), to.c_str()), from, to, ec,
+ error(!BOOST_MOVE_FILE(old_p.c_str(), new_p.c_str()), old_p, new_p, ec,
       "boost::filesystem::rename");
   }

@@ -1275,7 +1265,7 @@
       }
       if (ec == 0)
         throw_exception(filesystem_error("boost::filesystem::status",
- p, errno, system_category));
+ p, error_code(errno, system_category)));
       return fs::file_status(fs::status_error);
     }
     if (ec != 0) ec->clear();;
@@ -1330,7 +1320,7 @@
       }
       if (ec == 0)
         throw_exception(filesystem_error("boost::filesystem::status",
- p, errno, system_category));
+ p, error_code(errno, system_category)));
       return fs::file_status(fs::status_error);
     }
     if (ec != 0) ec->clear();

Modified: sandbox/filesystem-v3/libs/filesystem/test/msvc/filesystem-v3-sandbox.sln
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/test/msvc/filesystem-v3-sandbox.sln (original)
+++ sandbox/filesystem-v3/libs/filesystem/test/msvc/filesystem-v3-sandbox.sln 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
@@ -52,6 +52,36 @@
                 {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
         EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut_errors", "tut_errors\tut_errors.vcproj", "{B2F3B52F-A143-4BE1-9636-7AC7F75E7B63}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1}
+ {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut_i18n", "tut_i18n\tut_i18n.vcproj", "{CE7D7A5E-C747-4056-9908-20584923DAEB}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1}
+ {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut_intro", "tut_intro\tut_intro.vcproj", "{B31E3591-B45E-4139-8675-60C2158A8160}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1}
+ {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut_more", "tut_more\tut_more.vcproj", "{FC70A98E-428C-4B04-924F-9658969BA00C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1}
+ {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tut_path", "tut_path\tut_path.vcproj", "{F407A97C-703F-464B-BF23-5C1DBECF887A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F94CCADD-A90B-480C-A304-C19D015D36B1} = {F94CCADD-A90B-480C-A304-C19D015D36B1}
+ {FFD738F7-96F0-445C-81EA-551665EF53D1} = {FFD738F7-96F0-445C-81EA-551665EF53D1}
+ EndProjectSection
+EndProject
Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Win32 = Debug|Win32
@@ -113,6 +143,26 @@
                 {709A954B-4F1E-4375-A418-BCBFFE598715}.Debug|Win32.Build.0 = Debug|Win32
                 {709A954B-4F1E-4375-A418-BCBFFE598715}.Release|Win32.ActiveCfg = Release|Win32
                 {709A954B-4F1E-4375-A418-BCBFFE598715}.Release|Win32.Build.0 = Release|Win32
+ {B2F3B52F-A143-4BE1-9636-7AC7F75E7B63}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B2F3B52F-A143-4BE1-9636-7AC7F75E7B63}.Debug|Win32.Build.0 = Debug|Win32
+ {B2F3B52F-A143-4BE1-9636-7AC7F75E7B63}.Release|Win32.ActiveCfg = Release|Win32
+ {B2F3B52F-A143-4BE1-9636-7AC7F75E7B63}.Release|Win32.Build.0 = Release|Win32
+ {CE7D7A5E-C747-4056-9908-20584923DAEB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CE7D7A5E-C747-4056-9908-20584923DAEB}.Debug|Win32.Build.0 = Debug|Win32
+ {CE7D7A5E-C747-4056-9908-20584923DAEB}.Release|Win32.ActiveCfg = Release|Win32
+ {CE7D7A5E-C747-4056-9908-20584923DAEB}.Release|Win32.Build.0 = Release|Win32
+ {B31E3591-B45E-4139-8675-60C2158A8160}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B31E3591-B45E-4139-8675-60C2158A8160}.Debug|Win32.Build.0 = Debug|Win32
+ {B31E3591-B45E-4139-8675-60C2158A8160}.Release|Win32.ActiveCfg = Release|Win32
+ {B31E3591-B45E-4139-8675-60C2158A8160}.Release|Win32.Build.0 = Release|Win32
+ {FC70A98E-428C-4B04-924F-9658969BA00C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FC70A98E-428C-4B04-924F-9658969BA00C}.Debug|Win32.Build.0 = Debug|Win32
+ {FC70A98E-428C-4B04-924F-9658969BA00C}.Release|Win32.ActiveCfg = Release|Win32
+ {FC70A98E-428C-4B04-924F-9658969BA00C}.Release|Win32.Build.0 = Release|Win32
+ {F407A97C-703F-464B-BF23-5C1DBECF887A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F407A97C-703F-464B-BF23-5C1DBECF887A}.Debug|Win32.Build.0 = Debug|Win32
+ {F407A97C-703F-464B-BF23-5C1DBECF887A}.Release|Win32.ActiveCfg = Release|Win32
+ {F407A97C-703F-464B-BF23-5C1DBECF887A}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE

Modified: sandbox/filesystem-v3/libs/filesystem/test/operations_test.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/test/operations_test.cpp (original)
+++ sandbox/filesystem-v3/libs/filesystem/test/operations_test.cpp 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
@@ -548,12 +548,10 @@
 {
 std::cout << "rename_tests..." << std::endl;

- // rename() test case numbers refer to operations.htm#rename table
-
 fs::path file_ph(dir / "f1");
 BOOST_TEST(fs::exists(file_ph));

- // [case 1] make sure can't rename() a non-existent file
+ // error: rename a non-existent old file
 BOOST_TEST(!fs::exists(d1 / "f99"));
 BOOST_TEST(!fs::exists(d1 / "f98"));
 renamer n1a(d1 / "f99", d1 / "f98");
@@ -561,27 +559,38 @@
 renamer n1b(fs::path(""), d1 / "f98");
 BOOST_TEST(CHECK_EXCEPTION(n1b, ENOENT));

- // [case 2] rename() target.empty()
+ // error: rename an existing file to ""
 renamer n2(file_ph, "");
 BOOST_TEST(CHECK_EXCEPTION(n2, ENOENT));

- // [case 3] make sure can't rename() to an existent file or directory
+ // rename an existing file to an existent file
+ create_file(dir / "ff1", "ff1");
+ create_file(dir / "ff2", "ff2");
+ fs::rename(dir / "ff2", dir / "ff1");
+ BOOST_TEST(fs::exists(dir / "ff1"));
+ verify_file(dir / "ff1", "ff2");
+ BOOST_TEST(!fs::exists(dir / "ff2"));
+
+ // rename an existing file to itself
+ BOOST_TEST(fs::exists(dir / "f1"));
+ fs::rename(dir / "f1", dir / "f1");
+ BOOST_TEST(fs::exists(dir / "f1"));
+
+ // error: rename an existing directory to an existing non-empty directory
 BOOST_TEST(fs::exists(dir / "f1"));
 BOOST_TEST(fs::exists(d1 / "f2"));
- renamer n3a(dir / "f1", d1 / "f2");
- BOOST_TEST(CHECK_EXCEPTION(n3a, EEXIST));
 // several POSIX implementations (cygwin, openBSD) report ENOENT instead of EEXIST,
- // so we don't verify error type on the above test.
+ // so we don't verify error type on the following test.
 renamer n3b(dir, d1);
 BOOST_TEST(CHECK_EXCEPTION(n3b, 0));

- // [case 4A] can't rename() file to a nonexistent parent directory
+ // error: move existing file to a nonexistent parent directory
 BOOST_TEST(!fs::is_directory(dir / "f1"));
 BOOST_TEST(!fs::exists(dir / "d3/f3"));
 renamer n4a(dir / "f1", dir / "d3/f3");
 BOOST_TEST(CHECK_EXCEPTION(n4a, ENOENT));

- // [case 4B] rename() file in same directory
+ // rename existing file in same directory
 BOOST_TEST(fs::exists(d1 / "f2"));
 BOOST_TEST(!fs::exists(d1 / "f50"));
 fs::rename(d1 / "f2", d1 / "f50");
@@ -591,7 +600,7 @@
 BOOST_TEST(fs::exists(d1 / "f2"));
 BOOST_TEST(!fs::exists(d1 / "f50"));

- // [case 4C] rename() file d1/f2 to d2/f3
+ // move and rename an existing file to a different directory
 fs::rename(d1 / "f2", d2 / "f3");
 BOOST_TEST(!fs::exists(d1 / "f2"));
 BOOST_TEST(!fs::exists(d2 / "f2"));
@@ -601,14 +610,14 @@
 fs::rename(d2 / "f3", d1 / "f2");
 BOOST_TEST(fs::exists(d1 / "f2"));

- // [case 5A] rename() directory to nonexistent parent directory
+ // error: move existing directory to nonexistent parent directory
 BOOST_TEST(fs::exists(d1));
 BOOST_TEST(!fs::exists(dir / "d3/d5"));
 BOOST_TEST(!fs::exists(dir / "d3"));
 renamer n5a(d1, dir / "d3/d5");
 BOOST_TEST(CHECK_EXCEPTION(n5a, ENOENT));

- // [case 5B] rename() on directory
+ // rename existing directory
 fs::path d3(dir / "d3");
 BOOST_TEST(fs::exists(d1));
 BOOST_TEST(fs::exists(d1 / "f2"));
@@ -624,7 +633,7 @@
 BOOST_TEST(fs::exists(d1 / "f2"));
 BOOST_TEST(!fs::exists(d3));

- // [case 5C] rename() rename and move d1 to d2 / "d20"
+ // rename and move d1 to d2 / "d20"
 BOOST_TEST(fs::exists(d1));
 BOOST_TEST(!fs::exists(d2 / "d20"));
 BOOST_TEST(fs::exists(d1 / "f2"));

Modified: sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp
==============================================================================
--- sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp (original)
+++ sandbox/filesystem-v3/libs/filesystem/test/operations_unit_test.cpp 2009-12-07 14:52:16 EST (Mon, 07 Dec 2009)
@@ -41,7 +41,7 @@

 error_code ec;

- CHECK(file_size("no-such-file", ec) == 0);
+ CHECK(file_size("no-such-file", ec) == static_cast<boost::uintmax_t>(-1));
 CHECK(ec == errc::no_such_file_or_directory);

 CHECK(status("no-such-file") == file_status(file_not_found));

Next message: daniel_james_at_[hidden]: "[Boost-commit] svn:boost r58227 - in website/public_html/live/feed: . history"
Previous message: daniel_james_at_[hidden]: "[Boost-commit] svn:boost r58225 - trunk/boost/iostreams/detail"

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk