Changeset 10818 for OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp

Timestamp:

11/23/09 11:19:37 (3 years ago)

Author:

robert

Message:

From Chris Hanson, " Add support for requesting and setting the current directory (a la getcwd/chdir) via a
C++-friendly string-class API.

Prevent osgDB::concatPaths from faulting if the supplied "left" path string is empty."

Files:

• OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp

@@ -11 +11 @@
  * OpenSceneGraph Public License for more details.
 */
+
+// handle TCHAR type on various platforms
+// #ifndef is inspired by https://svn.apache.org/repos/asf/logging/log4cxx/tags/v0_9_4/include/log4cxx/helpers/tchar.h
+// defining type as plain char is from unzip.h, line 64
+
+#ifndef TCHAR
+typedef char TCHAR;
+#endif
+
 
 // currently this impl is for _all_ platforms, except as defined.
@@ -194 +203 @@
     return makeDirectory( getFilePath( path ));
 }
+
+
+std::string osgDB::getCurrentWorkingDirectory( void )
+{
+    // MAX_PATH/cwd inspired by unzip.cpp
+#ifndef MAX_PATH
+    #define MAX_PATH 1024
+#endif
+    TCHAR rootdir[MAX_PATH];
+    if(getcwd(rootdir,MAX_PATH-1))
+    {
+        return(rootdir);
+    }
+    return("");
+}// osgDB::getCurrentWorkingDirectory
+
+
+
+bool osgDB::setCurrentWorkingDirectory( const std::string &newCurrentWorkingDirectory )
+{
+    if (newCurrentWorkingDirectory.empty())
+    {
+        osg::notify(osg::DEBUG_INFO) << "osgDB::setCurrentWorkingDirectory(): called with empty string." << std::endl;
+        return false;
+    }
+    
+#ifdef OSG_USE_UTF8_FILENAME
+    return _wchdir( OSGDB_STRING_TO_FILENAME(newCurrentWorkingDirectory).c_str()) == 0;
+#else
+    return chdir( newCurrentWorkingDirectory.c_str()) == 0;
+#endif
+
+    return true;
+} // osgDB::setCurrentWorkingDirectory
+
+
 
 void osgDB::convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath)