I also know that quoting white-space paths works well in "command.com"
Windows shells. But apparently it didn't work when terrasync called the
"system" function to call "svn". Unfortunately I have no means to test
any of this on Windows.
The following patch seem to do the trick for me, it allow whitespace in
the command and in the local path name.
It simply wraps the entire system() command in "" and uses backslash
instead of forward slash for the path
separator in the local path.
Please check, if it works for you.
Greetings, Torsten
diff --git a/simgear/scene/tsync/terrasync.cxx
b/simgear/scene/tsync/terrasync.cxx
index 1d9bf8e..48e9ede 100644
--- a/simgear/scene/tsync/terrasync.cxx
+++ b/simgear/scene/tsync/terrasync.cxx
@@ -315,6 +315,7 @@ bool SGTerraSync::SvnThread::start()
#ifdef SG_WINDOWS
if ((_use_svn)&&(!use_int_svn))
{
+#if 0
// external SVN support is used
if (hasWhitespace(_local_dir))
{
@@ -338,6 +339,7 @@ bool SGTerraSync::SvnThread::start()
_stalled = true;
return false;
}
+#endif
}
#endif
@@ -494,7 +496,7 @@ bool SGTerraSync::SvnThread::syncTreeExternal(const char*
dir)
#ifdef SG_WINDOWS
// no support for white-space paths
snprintf( command, 512,
- "%s %s %s/%s %s/%s", _svn_command.c_str(), svn_options,
+ "\"%s %s %s/%s %s\\%s\"", _svn_command.c_str(), svn_options,
_svn_server.c_str(), dir,
_local_dir.c_str(), dir );
#else
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
