Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r50671 - in branches/release: boost/filesystem libs/filesystem libs/filesystem/doc libs/filesystem/src libs/filesystem/test
From: bdawes_at_[hidden]
Date: 2009-01-19 09:10:42

Next message: pbristow_at_[hidden]: "[Boost-commit] svn:boost r50672 - sandbox/math_toolkit/libs/math/doc/sf_and_dist/distributions"
Previous message: john_at_[hidden]: "[Boost-commit] svn:boost r50670 - trunk/tools/build/v2/tools"

Author: bemandawes
Date: 2009-01-19 09:10:41 EST (Mon, 19 Jan 2009)
New Revision: 50671
URL: http://svn.boost.org/trac/boost/changeset/50671

Log:
Filesystem: merge from trunk
Added:
   branches/release/libs/filesystem/CMakeLists.txt
      - copied unchanged from r50670, /trunk/libs/filesystem/CMakeLists.txt
   branches/release/libs/filesystem/module.cmake
      - copied unchanged from r50670, /trunk/libs/filesystem/module.cmake
   branches/release/libs/filesystem/src/CMakeLists.txt
      - copied unchanged from r50670, /trunk/libs/filesystem/src/CMakeLists.txt
   branches/release/libs/filesystem/test/CMakeLists.txt
      - copied unchanged from r50670, /trunk/libs/filesystem/test/CMakeLists.txt
Text files modified:
   branches/release/boost/filesystem/path.hpp | 18 +++++++
   branches/release/libs/filesystem/doc/portability_guide.htm | 76 +++++++++++++++++++++--------------
   branches/release/libs/filesystem/src/operations.cpp | 4
   branches/release/libs/filesystem/src/portability.cpp | 29 +++++++------
   branches/release/libs/filesystem/test/path_test.cpp | 85 ++++++++++++++++++++++++++++++++++++++++
   5 files changed, 164 insertions(+), 48 deletions(-)

Modified: branches/release/boost/filesystem/path.hpp
==============================================================================
--- branches/release/boost/filesystem/path.hpp (original)
+++ branches/release/boost/filesystem/path.hpp 2009-01-19 09:10:41 EST (Mon, 19 Jan 2009)
@@ -97,8 +97,9 @@
 { BOOST_STATIC_CONSTANT( bool, value = true ); };
# endif

- // these only have to be specialized if Path::string_type::value_type
- // is not convertible from char
+ // These only have to be specialized if Path::string_type::value_type
+ // is not convertible from char, although specializations may eliminate
+ // compiler warnings. See ticket 2543.
 template<class Path> struct slash
 { BOOST_STATIC_CONSTANT( char, value = '/' ); };

@@ -108,9 +109,22 @@
 template<class Path> struct colon
 { BOOST_STATIC_CONSTANT( char, value = ':' ); };

+# ifndef BOOST_FILESYSTEM_NARROW_ONLY
+ template<> struct slash<wpath>
+ { BOOST_STATIC_CONSTANT( wchar_t, value = L'/' ); };
+ template<> struct dot<wpath>
+ { BOOST_STATIC_CONSTANT( wchar_t, value = L'.' ); };
+ template<> struct colon<wpath>
+ { BOOST_STATIC_CONSTANT( wchar_t, value = L':' ); };
+# endif
+
# ifdef BOOST_WINDOWS_PATH
 template<class Path> struct path_alt_separator
 { BOOST_STATIC_CONSTANT( char, value = '\\' ); };
+# ifndef BOOST_FILESYSTEM_NARROW_ONLY
+ template<> struct path_alt_separator<wpath>
+ { BOOST_STATIC_CONSTANT( wchar_t, value = L'\\' ); };
+# endif
# endif

 // workaround for VC++ 7.0 and earlier issues with nested classes

Modified: branches/release/libs/filesystem/doc/portability_guide.htm
==============================================================================
--- branches/release/libs/filesystem/doc/portability_guide.htm (original)
+++ branches/release/libs/filesystem/doc/portability_guide.htm 2009-01-19 09:10:41 EST (Mon, 19 Jan 2009)
@@ -6,6 +6,7 @@
<meta name="ProgId" content="FrontPage.Editor.Document">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<title>Portability Guide</title>
+<link rel="stylesheet" type="text/css" href="../../../doc/html/minimal.css">
</head>

<body bgcolor="#FFFFFF">
@@ -22,15 +23,16 @@
<h2><a name="Introduction">Introduction</a></h2>
Like any other C++ program which performs I/O operations, there is no
guarantee that a program using Boost.Filesystem will be portable between
-operating systems. Critical aspects of I/O, such as how the operating system
-interprets paths, are unspecified by the C and C++ Standards.
+operating systems. Critical aspects of I/O such as how the operating system
+interprets paths are unspecified by the C and C++ Standards.
It is not possible to know if a file or directory name will be
valid (and thus portable) for an unknown operating system. There is always the possibility that an operating system could use
names which are unusual (numbers less than 4096, for example) or very
limited in size (maximum of six character names, for example). In other words,
-portability is never absolute; it is always relative to specific operating or
+portability is never absolute; it is always relative to specific operating
+systems or
file systems.
-It is possible to know in advance if a directory or file name is likely to be valid for a particular
+It is possible, however, to know in advance if a directory or file name is likely to be valid for a particular
operating system. It is also possible to construct names which are
likely to be portable to a large number of modern and legacy operating systems.

@@ -40,9 +42,10 @@

Each file system
may have its own naming rules. For example, modern versions of Windows support NTFS, FAT, FAT32, and ISO-9660 file systems, among others, and the naming rules
-for some of those file systems differ a great deal. Each file system may have
+for those file systems differ. Each file system may also have
differing rules for overall path validity, such as a maximum length or number of
-sub-directories.
+sub-directories. Some legacy systems have different rules for directory names
+versus regular file names.

As a result, Boost.Filesystem's name_check functions
cannot guarantee directory and file name portability. Rather, they are intended to
@@ -52,9 +55,8 @@
<h2><a name="name_check_functions">name_check functions</a></h2>

A name_check function
-returns true if its argument is a valid name for a particular operating or file
-system. A number of these functions are supplied, and user-supplied 
-name_check functions are also allowed.
+returns true if its argument is valid as a directory and regular file name for a
+particular operating or file system. A number of these functions are provided.

The portable_name function is of particular
interest because it has been carefully designed to provide wide
@@ -65,23 +67,29 @@
 <td align="center" colspan="2">Library Supplied name_check Functions</td>
 </tr>
 <tr>
- <td align="center">Name</td>
+ <td align="center">Function</td>
 <td align="center">Description</td>
 </tr>
 <tr>
- <td align="left" valign="top"><code><a name="portable_posix_name">portable_posix_name</a></code></td>
- <td>Returns true for names containing only the characters
+ <td align="left" valign="top"><code><a name="portable_posix_name">portable_posix_name</a>(const
+ std::string& name)</code></td>
+ <td>Returns: true if <code>!name.empty() && name</code> contains only the characters
 specified in Portable Filename Character Set rules as defined in by
 POSIX (www.opengroup.org/onlinepubs/007904975/basedefs/xbd_chap03.html). 
- Only characters allowed are 0-9, a-z, A-Z, '.', '_', and '-'.Use:
+ The allowed characters are <code>0-9</code>, <code>a-z</code>, <code>A-Z</code>,
+ <code>'.'</code>, <code>'_'</code>, and <code>'-'</code>.Use:
 applications which must be portable to any POSIX system.</td>
 </tr>
 <tr>
- <td align="left" valign="top"><code><a name="windows_name">windows_name</a></code></td>
- <td>Returns true for names containing only the characters
- specified by the Windows platform SDK as valid regardless of the file
- system. Allows any character except 0x0-0x1F, '<', '>', ':', '"', '/', '\',
- and '|'. Furthermore, names must not end with a trailing space or period.
+ <td align="left" valign="top"><code><a name="windows_name">windows_name</a>(const
+ std::string& name)</code></td>
+ <td>Returns:  true if <code>!name.empty() && name</code> contains
+ only the characters specified by the Windows platform SDK as valid
+ regardless of the file system <code>&& (name</code> is <code>"."</code> or
+ <code>".."</code>  or does not end with a trailing space or period<code>)</code>. 
+ The allowed characters are anything except <code>0x0-0x1F</code>, <code>'<'</code>,
+ <code>'>'</code>, <code>':'</code>, <code>'"'</code>, <code>'/'</code>,
+ <code>'\'</code>, and <code>'|'</code>.
 Use: applications which must be portable to Windows.
 Note: Reserved device names are not valid as file names, but are
 not being detected because they are still valid as a path. Specifically,
@@ -89,30 +97,36 @@
 an extension (for example, NUL.tx7).</td>
 </tr>
 <tr>
- <td align="left" valign="top"><code><a name="portable_name">portable_name</a></code></td>
- <td><code>windows_name(name) && portable_posix_name(name)</code>,
- and the first character not a period or hyphen.Use: applications which must be portable to a wide variety of
- modern operating systems, large and small, and to some legacy O/S's.</td>
+ <td align="left" valign="top"><code><a name="portable_name">portable_name</a>(const
+ std::string& name)</code></td>
+ <td>Returns: <code> windows_name(name) && portable_posix_name(name)
+ && (name</code> is <code>"."</code> or <code>".."</code>, and the first character not a period or hyphen<code>)</code>.Use: applications which must be portable to a wide variety of
+ modern operating systems, large and small, and to some legacy O/S's. The
+ first character not a period or hyphen restriction is a requirement of
+ several older operating systems.</td>
 </tr>
 <tr>
 <td align="left" valign="top"><code><a name="portable_directory_name">
- portable_directory_name</a></code></td>
- <td><code>portable_name(name)</code>, and no periods.Use: applications
+ portable_directory_name</a>(const std::string& name)</code></td>
+ <td>Returns: <code>portable_name(name) && (name</code> is <code>"."</code>
+ or <code>".."</code>  or contains no periods<code>)</code>.Use: applications
 which must be portable to a wide variety of platforms, including OpenVMS.</td>
 </tr>
 <tr>
 <td align="left" valign="top"><code><a name="portable_file_name">
- portable_file_name</a></code></td>
- <td><code>portable_name(name)</code>,except allows one
- period only, and only if followed by one to three additional characters.Use:
+ portable_file_name</a>(const std::string& name)</code></td>
+ <td>Returns: <code>portable_name(name) && </code>any period is followed by one to three additional
+ non-period characters.Use:
 applications which must be portable to a wide variety of platforms,
 including OpenVMS and other systems which have a concept of "file extension"
 but limit its length.</td>
 </tr>
 <tr>
- <td align="left" valign="top"><code><a name="native">native</a></code></td>
- <td>Implementation defined name_check. Returns 
- true for all names considered valid by the operating system.Note: May return true for some names not considered valid
+ <td align="left" valign="top"><code><a name="native">native</a>(const
+ std::string& name)</code></td>
+ <td>Returns: Implementation defined. Returns 
+ true for names considered valid by the operating system's native file
+ systems.Note: May return true for some names not considered valid
 by the operating system under all conditions (particularly on operating systems which support
 multiple file systems.)</td>
 </tr>
@@ -199,7 +213,7 @@

<hr>
Revised
-03 June, 2007
+11 January, 2009

© Copyright Beman Dawes, 2002, 2003
 Use, modification, and distribution are subject to the Boost Software

Modified: branches/release/libs/filesystem/src/operations.cpp
==============================================================================
--- branches/release/libs/filesystem/src/operations.cpp (original)
+++ branches/release/libs/filesystem/src/operations.cpp 2009-01-19 09:10:41 EST (Mon, 19 Jan 2009)
@@ -583,7 +583,7 @@
 // rmdir() or unlink() as indicated.
 // Same bug also reported for QNX, with the same fix.
 int err = ::unlink( p );
- if ( err != EPERM )
+ if ( err == 0 || errno != EPERM )
 return err;
 return ::rmdir( p );
# else
@@ -1205,7 +1205,7 @@
 {
 const std::size_t buf_sz = 32768;
 boost::scoped_array<char> buf( new char [buf_sz] );
- int infile=0, outfile=0; // init quiets compiler warning
+ int infile=-1, outfile=-1; // -1 means not open
 struct stat from_stat;

 if ( ::stat( from_file_ph.c_str(), &from_stat ) != 0

Modified: branches/release/libs/filesystem/src/portability.cpp
==============================================================================
--- branches/release/libs/filesystem/src/portability.cpp (original)
+++ branches/release/libs/filesystem/src/portability.cpp 2009-01-19 09:10:41 EST (Mon, 19 Jan 2009)
@@ -56,7 +56,9 @@
# else
     BOOST_FILESYSTEM_DECL bool native( const std::string & name )
     {
- return name.find('/') == std::string::npos;
+ return name.size() != 0
+ && name[0] != ' '
+ && name.find('/') == std::string::npos;
     }
# endif

@@ -69,6 +71,7 @@
     BOOST_FILESYSTEM_DECL bool windows_name( const std::string & name )
     {
       return name.size() != 0
+ && name[0] != ' '
         && name.find_first_of( windows_invalid_chars ) == std::string::npos
         && *(name.end()-1) != ' '
         && (*(name.end()-1) != '.'
@@ -78,12 +81,12 @@
     BOOST_FILESYSTEM_DECL bool portable_name( const std::string & name )
     {
       return
- name.size() == 0
- || name == "."
- || name == ".."
- || (windows_name( name )
- && portable_posix_name( name )
- && name[0] != '.' && name[0] != '-');
+ name.size() != 0
+ && ( name == "."
+ || name == ".."
+ || (windows_name( name )
+ && portable_posix_name( name )
+ && name[0] != '.' && name[0] != '-'));
     }

     BOOST_FILESYSTEM_DECL bool portable_directory_name( const std::string & name )
@@ -99,12 +102,12 @@
     {
       std::string::size_type pos;
       return
- name == "."
- || name == ".."
- || (portable_name( name )
- && ( (pos = name.find( '.' )) == std::string::npos
- || (name.find( '.', pos+1 )== std::string::npos
- && (pos + 5) > name.length() )))
+ portable_name( name )
+ && name != "."
+ && name != ".."
+ && ( (pos = name.find( '.' )) == std::string::npos
+ || (name.find( '.', pos+1 ) == std::string::npos
+ && (pos + 5) > name.length() ))
         ;
     }

Modified: branches/release/libs/filesystem/test/path_test.cpp
==============================================================================
--- branches/release/libs/filesystem/test/path_test.cpp (original)
+++ branches/release/libs/filesystem/test/path_test.cpp 2009-01-19 09:10:41 EST (Mon, 19 Jan 2009)
@@ -106,6 +106,90 @@
 }
 }

+
+ // name_function_tests ---------------------------------------------------//
+
+ void name_function_tests()
+ {
+ std::cout << "name_function_tests..." << std::endl;
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( "x" ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( "x" ) ) );
+ BOOST_CHECK( fs::portable_name( std::string( "x" ) ) );
+ BOOST_CHECK( fs::portable_directory_name( std::string( "x" ) ) );
+ BOOST_CHECK( fs::portable_file_name( std::string( "x" ) ) );
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( "." ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( "." ) ) );
+ BOOST_CHECK( fs::portable_name( std::string( "." ) ) );
+ BOOST_CHECK( fs::portable_directory_name( std::string( "." ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( "." ) ) );
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( ".." ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( ".." ) ) );
+ BOOST_CHECK( fs::portable_name( std::string( ".." ) ) );
+ BOOST_CHECK( fs::portable_directory_name( std::string( ".." ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( ".." ) ) );
+
+ BOOST_CHECK( !fs::native( std::string( "" ) ) );
+ BOOST_CHECK( !fs::portable_posix_name( std::string( "" ) ) );
+ BOOST_CHECK( !fs::windows_name( std::string( "" ) ) );
+ BOOST_CHECK( !fs::portable_name( std::string( "" ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( "" ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( "" ) ) );
+
+ BOOST_CHECK( !fs::native( std::string( " " ) ) );
+ BOOST_CHECK( !fs::portable_posix_name( std::string( " " ) ) );
+ BOOST_CHECK( !fs::windows_name( std::string( " " ) ) );
+ BOOST_CHECK( !fs::portable_name( std::string( " " ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( " " ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( " " ) ) );
+
+ BOOST_CHECK( !fs::portable_posix_name( std::string( ":" ) ) );
+ BOOST_CHECK( !fs::windows_name( std::string( ":" ) ) );
+ BOOST_CHECK( !fs::portable_name( std::string( ":" ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( ":" ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( ":" ) ) );
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( "-" ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( "-" ) ) );
+ BOOST_CHECK( !fs::portable_name( std::string( "-" ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( "-" ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( "-" ) ) );
+
+ BOOST_CHECK( !fs::portable_posix_name( std::string( "foo bar" ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( "foo bar" ) ) );
+ BOOST_CHECK( !fs::windows_name( std::string( " bar" ) ) );
+ BOOST_CHECK( !fs::windows_name( std::string( "foo " ) ) );
+ BOOST_CHECK( !fs::portable_name( std::string( "foo bar" ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( "foo bar" ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( "foo bar" ) ) );
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( "foo.bar" ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( "foo.bar" ) ) );
+ BOOST_CHECK( fs::portable_name( std::string( "foo.bar" ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( "foo.bar" ) ) );
+ BOOST_CHECK( fs::portable_file_name( std::string( "foo.bar" ) ) );
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( "foo.barf" ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( "foo.barf" ) ) );
+ BOOST_CHECK( fs::portable_name( std::string( "foo.barf" ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( "foo.barf" ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( "foo.barf" ) ) );
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( ".foo" ) ) );
+ BOOST_CHECK( fs::windows_name( std::string( ".foo" ) ) );
+ BOOST_CHECK( !fs::portable_name( std::string( ".foo" ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( ".foo" ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( ".foo" ) ) );
+
+ BOOST_CHECK( fs::portable_posix_name( std::string( "foo." ) ) );
+ BOOST_CHECK( !fs::windows_name( std::string( "foo." ) ) );
+ BOOST_CHECK( !fs::portable_name( std::string( "foo." ) ) );
+ BOOST_CHECK( !fs::portable_directory_name( std::string( "foo." ) ) );
+ BOOST_CHECK( !fs::portable_file_name( std::string( "foo." ) ) );
+ }
+
} // unnamed namespace

int test_main( int, char*[] )
@@ -131,6 +215,7 @@
 BOOST_CHECK( p4.string() == "foobar" );

 exception_tests();
+ name_function_tests();

 // These verify various overloads don't cause compiler errors

Next message: pbristow_at_[hidden]: "[Boost-commit] svn:boost r50672 - sandbox/math_toolkit/libs/math/doc/sf_and_dist/distributions"
Previous message: john_at_[hidden]: "[Boost-commit] svn:boost r50670 - trunk/tools/build/v2/tools"

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