[Saga-devel] saga SVN commit 3300: /trunk/
hkaiser at cct.lsu.edu
hkaiser at cct.lsu.edu
Thu Jan 15 10:18:46 CST 2009
User: hkaiser
Date: 2009/01/15 10:18 AM
Modified:
/trunk/adaptors/default/file/
default_namespace_dir_impl.hpp
/trunk/adaptors/default/project/VS.NET/default_file/
default_file.vcproj
/trunk/tools/shell/
ls.cpp
Log:
Fixed escaping problems in default file adaptor (and shell). This fixes #319
File Changes:
Directory: /trunk/adaptors/default/project/VS.NET/default_file/
===============================================================
File [modified]: default_file.vcproj
Delta lines: +179 -61
===================================================================
--- trunk/adaptors/default/project/VS.NET/default_file/default_file.vcproj 2009-01-15 14:55:18 UTC (rev 3299)
+++ trunk/adaptors/default/project/VS.NET/default_file/default_file.vcproj 2009-01-15 16:18:43 UTC (rev 3300)
@@ -99,6 +99,87 @@
/>
</Configuration>
<Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="..\..\..\..\..\project\VS.NET\saga_adaptor.vsprops"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(SAGA_SRC_ROOT)\test"
+ PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName)d.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
@@ -178,12 +259,13 @@
/>
</Configuration>
<Configuration
- Name="Debug Lib|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- InheritedPropertySheets="..\..\..\..\..\project\VS.NET\saga_adaptor-lite.vsprops"
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="..\..\..\..\..\project\VS.NET\saga_adaptor.vsprops"
CharacterSet="0"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -199,17 +281,14 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
AdditionalIncludeDirectories="$(SAGA_SRC_ROOT)\test"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
- ProgramDataBaseFileName="$(OutDir)\$(ProjectName)d.pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
@@ -224,13 +303,23 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName)d.lib"
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -240,15 +329,22 @@
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release Lib|Win32"
+ Name="Debug Lib|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="..\..\..\..\..\project\VS.NET\saga_adaptor-lite.vsprops"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -267,8 +363,17 @@
/>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
AdditionalIncludeDirectories="$(SAGA_SRC_ROOT)\test"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(OutDir)\$(ProjectName)d.pdb"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -281,6 +386,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\$(ProjectName)d.lib"
/>
<Tool
Name="VCALinkTool"
@@ -299,12 +405,8 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\..\project\VS.NET\saga_adaptor.vsprops"
- CharacterSet="0"
+ Name="Debug Lib|x64"
+ ConfigurationType="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -320,20 +422,9 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(SAGA_SRC_ROOT)\test"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -346,13 +437,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
- OutputFile="$(OutDir)\$(ProjectName)d.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -380,13 +464,11 @@
/>
</Configuration>
<Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets="..\..\..\..\..\project\VS.NET\saga_adaptor.vsprops"
- CharacterSet="0"
- WholeProgramOptimization="1"
+ Name="Release Lib|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="..\..\..\..\..\project\VS.NET\saga_adaptor-lite.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -402,17 +484,11 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(SAGA_SRC_ROOT)\test"
- PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -424,15 +500,57 @@
Name="VCPreLinkEventTool"
/>
<Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release Lib|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
- AdditionalDependencies="WS2_32.lib"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
Directory: /trunk/adaptors/default/file/
========================================
File [modified]: default_namespace_dir_impl.hpp
Delta lines: +3 -10
===================================================================
--- trunk/adaptors/default/file/default_namespace_dir_impl.hpp 2009-01-15 14:55:18 UTC (rev 3299)
+++ trunk/adaptors/default/file/default_namespace_dir_impl.hpp 2009-01-15 16:18:43 UTC (rev 3300)
@@ -318,16 +318,9 @@
fs::directory_iterator dir_end = fs::directory_iterator();
for (fs::directory_iterator dir_it(path); dir_it != dir_end; ++dir_it)
{
- try {
- //retval.push_back(host + saga::detail::leaf((*dir_it))); see --> Spec. p. 141
- retval.push_back(saga::detail::leaf(*dir_it));
- }
- catch ( ... )
- {
- // ignore this one
- SAGA_LOG_ERROR("Boost failed to handle some filename");
- SAGA_LOG_ALWAYS("Boost failed to handle some filename");
- }
+ //retval.push_back(host + saga::detail::leaf((*dir_it))); see --> Spec. p. 141
+ saga::url p(saga::url::escape(saga::detail::leaf(*dir_it)));
+ retval.push_back(p);
}
}
Directory: /trunk/tools/shell/
==============================
File [modified]: ls.cpp
Delta lines: +2 -2
===================================================================
--- trunk/tools/shell/ls.cpp 2009-01-15 14:55:18 UTC (rev 3299)
+++ trunk/tools/shell/ls.cpp 2009-01-15 16:18:43 UTC (rev 3300)
@@ -30,7 +30,7 @@
for ( std::size_t i = 0; i < entries.size (); ++i )
{
p.out += " ";
- p.out += entries[i].get_string ();
+ p.out += saga::url::unescape(entries[i].get_string());
// check if child is directory, mark it
if ( cwd_.is_dir (entries[i]) )
@@ -42,7 +42,7 @@
if ( cwd_.is_link (entries[i]) )
{
p.out += " -> ";
- p.out += cwd_.read_link (entries[i]).get_string ();
+ p.out += saga::url::unescape(cwd_.read_link(entries[i]).get_string());
}
p.out += "\n";
More information about the saga-devel
mailing list