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

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

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

OpenSceneGraph/trunk/src/osgDB/FileUtils.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -33 +33 @@
     #include <sys/stat.h>
     #include <direct.h> // for _mkdir
-    
+
     #define mkdir(x,y) _mkdir((x))
     #define stat64 _stati64
@@ -52 +52 @@
     //IOS includes
     #include "TargetConditionals.h"
-    
-    #if (TARGET_OS_IPHONE) 
+
+    #if (TARGET_OS_IPHONE)
         #include <Availability.h>
         // workaround a bug which appears when compiling for SDK < 4.0 and for the simulator
         #ifdef __IPHONE_4_0 && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_4_0)
             #define stat64 stat
-        #else 
+        #else
             #if !TARGET_IPHONE_SIMULATOR
                 #define stat64 stat
@@ -69 +69 @@
     // By default, MAC_OS_X_VERSION_MAX_ALLOWED is set to the latest
     // system the headers know about. So I will use this as the control
-    // variable. (MIN_ALLOWED is set low by default so it is 
-    // unhelpful in this case.) 
+    // variable. (MIN_ALLOWED is set low by default so it is
+    // unhelpful in this case.)
     // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4
     // for older OS's like Jaguar, Panther since they are not defined,
@@ -145 +145 @@
         return false;
     }
-    
+
     struct stat64 stbuf;
 #ifdef OSG_USE_UTF8_FILENAME
@@ -169 +169 @@
         if( dir.empty() )
             break;
- 
+
 #ifdef OSG_USE_UTF8_FILENAME
         if( _wstat64( OSGDB_STRING_TO_FILENAME(dir).c_str(), &stbuf ) < 0 )
@@ -182 +182 @@
                     paths.push( dir );
                     break;
- 
+
                 default:
                     OSG_DEBUG << "osgDB::makeDirectory(): "  << strerror(errno) << std::endl;
@@ -194 +194 @@
     {
         std::string dir = paths.top();
- 
+
         #if defined(WIN32)
             //catch drive name
@@ -211 +211 @@
             OSG_DEBUG << "osgDB::makeDirectory(): "  << strerror(errno) << std::endl;
             return false;
-        } 
+        }
         paths.pop();
     }
@@ -246 +246 @@
         return false;
     }
-    
+
 #ifdef OSG_USE_UTF8_FILENAME
     return _wchdir( OSGDB_STRING_TO_FILENAME(newCurrentWorkingDirectory).c_str()) == 0;
@@ -280 +280 @@
             filepath.push_back(lastPath);
     }
- 
+
 }
 
@@ -314 +314 @@
 std::string osgDB::findFileInPath(const std::string& filename, const FilePathList& filepath,CaseSensitivity caseSensitivity)
 {
-    if (filename.empty()) 
+    if (filename.empty())
         return filename;
 
-    if (!isFileNameNativeStyle(filename)) 
+    if (!isFileNameNativeStyle(filename))
         return findFileInPath(convertFileNameToNativeStyle(filename), filepath, caseSensitivity);
 
@@ -327 +327 @@
         OSG_DEBUG << "itr='" <<*itr<< "'\n";
         std::string path = itr->empty() ? filename : concatPaths(*itr, filename);
-        
+
         path = getRealPath(path);
 
         OSG_DEBUG << "FindFileInPath() : trying " << path << " ...\n";
-        if(fileExists(path)) 
+        if(fileExists(path))
         {
             OSG_DEBUG << "FindFileInPath() : USING " << path << "\n";
             return path;
         }
-#ifndef WIN32 
+#ifndef WIN32
 // windows already case insensitive so no need to retry..
-        else if (caseSensitivity==CASE_INSENSITIVE) 
+        else if (caseSensitivity==CASE_INSENSITIVE)
         {
             std::string foundfile = findFileInDirectory(filename,*itr,CASE_INSENSITIVE);
@@ -344 +344 @@
         }
 #endif
-            
+
     }
 
@@ -381 +381 @@
         bool win32 = false;
     #endif
-    
+
     // If the fileName contains extra path information, make that part of the
     // directory name instead
@@ -459 +459 @@
                 realDirName = findFileInDirectory(lastElement, parentPath,
                                                   CASE_INSENSITIVE);
-      
+
                 dc = osgDB::getDirectoryContents(realDirName);
                 char lastChar = realDirName[realDirName.size()-1];
@@ -724 +724 @@
         convertStringPathIntoFilePathList("/usr/bin/:/usr/local/bin/",filepath);
     }
-    
+
 #elif defined(WIN32)
 
@@ -731 +731 @@
         // See http://msdn2.microsoft.com/en-us/library/ms682586.aspx
 
-        // Safe DLL search mode changes the DLL search order to search for 
+        // Safe DLL search mode changes the DLL search order to search for
         // DLLs in the current directory after the system directories, instead
-        // of right after the application's directory. According to the article 
-        // linked above, on Windows XP and Windows 2000, Safe DLL search mode 
-        // is disabled by default. However, it is a good idea to enable it. We 
+        // of right after the application's directory. According to the article
+        // linked above, on Windows XP and Windows 2000, Safe DLL search mode
+        // is disabled by default. However, it is a good idea to enable it. We
         // will search as if it was enabled.
 
@@ -748 +748 @@
         {
             filenamestring pathstr(path);
-            filenamestring executableDir(pathstr, 0, 
+            filenamestring executableDir(pathstr, 0,
                                       pathstr.find_last_of(OSGDB_FILENAME_TEXT("\\/")));
             convertStringPathIntoFilePathList(OSGDB_FILENAME_TO_STRING(executableDir), filepath);
@@ -797 +797 @@
         #endif
 
-        //   3. The system directory. Use the GetSystemDirectory function to 
+        //   3. The system directory. Use the GetSystemDirectory function to
         //      get the path of this directory.
         filenamechar systemDir[(UINT)size];
@@ -804 +804 @@
         if (retval != 0 && retval < size)
         {
-            convertStringPathIntoFilePathList(OSGDB_FILENAME_TO_STRING(systemDir), 
+            convertStringPathIntoFilePathList(OSGDB_FILENAME_TO_STRING(systemDir),
                                               filepath);
         }
@@ -811 +811 @@
             OSG_WARN << "Could not get system directory using "
                 "Win32 API, using default directory." << std::endl;
-            convertStringPathIntoFilePathList("C:\\Windows\\System32", 
+            convertStringPathIntoFilePathList("C:\\Windows\\System32",
                                               filepath);
         }
 
-        //   4. The 16-bit system directory. There is no function that obtains 
+        //   4. The 16-bit system directory. There is no function that obtains
         //      the path of this directory, but it is searched.
-        //   5. The Windows directory. Use the GetWindowsDirectory function to 
+        //   5. The Windows directory. Use the GetWindowsDirectory function to
         //      get the path of this directory.
         filenamechar windowsDir[(UINT)size];
@@ -823 +823 @@
         if (retval != 0 && retval < size)
         {
-            convertStringPathIntoFilePathList(std::string(OSGDB_FILENAME_TO_STRING(windowsDir)) + 
+            convertStringPathIntoFilePathList(std::string(OSGDB_FILENAME_TO_STRING(windowsDir)) +
                                               "\\System", filepath);
-            convertStringPathIntoFilePathList(OSGDB_FILENAME_TO_STRING(windowsDir), 
+            convertStringPathIntoFilePathList(OSGDB_FILENAME_TO_STRING(windowsDir),
                                               filepath);
         }
@@ -840 +840 @@
         convertStringPathIntoFilePathList(".", filepath);
 
-        //   7. The directories that are listed in the PATH environment 
-        //      variable. Note that this does not include the per-application 
+        //   7. The directories that are listed in the PATH environment
+        //      variable. Note that this does not include the per-application
         //      path specified by the App Paths registry key.
         filenamechar* ptr;
@@ -859 +859 @@
         appendInstallationLibraryFilePaths(filepath);
     }
-    
+
 #elif defined(__APPLE__)
 #if (TARGET_OS_IPHONE)
@@ -876 +876 @@
     #endif
     #include <iostream>
-    
+
     // These functions are local to FileUtils.cpp and not exposed to the API
     // returns the path string except for numToShorten directories stripped off the end
@@ -913 +913 @@
         }
         return path;
-        
+
     }
 
@@ -931 +931 @@
         }
         return path;
-        
+
     }
 
@@ -948 +948 @@
     // The Cocoa version is about 10 lines of code.
     // The Carbon version is noticably longer.
-    // Unfortunately, the Cocoa version requires -lobjc to be 
-    // linked in when creating an executable. 
+    // Unfortunately, the Cocoa version requires -lobjc to be
+    // linked in when creating an executable.
     // Rumor is that this will be done autmatically in gcc 3.5/Tiger,
     // but for now, this will cause a lot of headaches for people
-    // who aren't familiar with this concept, so the Carbon version 
+    // who aren't familiar with this concept, so the Carbon version
     // is preferable.
     // But for the curious, both implementations are here.
-    // Note that if the Cocoa version is used, the file should be 
+    // Note that if the Cocoa version is used, the file should be
     // renamed to use the .mm extension to denote Objective-C++.
     // And of course, you will need to link against Cocoa
-    // Update: There is a bug in the Cocoa version. Advanced users can remap 
+    // Update: There is a bug in the Cocoa version. Advanced users can remap
     // their systems so these paths go somewhere else. The Carbon calls
     // will catch this, but the hardcoded Cocoa code below will not.
@@ -969 +969 @@
     // /Library/Application Support/OpenSceneGraph/PlugIns
     // /Network/Library/Application Support/OpenSceneGraph/PlugIns
-    // 
-    // As a side effect of this function, if the application is not a 
+    //
+    // As a side effect of this function, if the application is not a
     // bundle, the first place searched becomes
     // YourProgram/PlugIns
@@ -977 +977 @@
     // ~/Library/Application Support/YourProgram/PlugIns
     // /Library/Application Support/YourProgram/PlugIns
-    // /Network/Library/Application Support/TheProgram/PlugIns 
-    // But I'm not going to worry about it for now because the 
-    // bundle's PlugIns directory is supposed to be the preferred 
+    // /Network/Library/Application Support/TheProgram/PlugIns
+    // But I'm not going to worry about it for now because the
+    // bundle's PlugIns directory is supposed to be the preferred
     // place for this anyway.
     //
@@ -985 +985 @@
     // the directory the program resides in,
     // but I'm worried about multiplatform distribution.
-    // Because .so is used by other platforms like Linux, we 
+    // Because .so is used by other platforms like Linux, we
     // could end up loading the wrong binary.
     // I'm not sure how robust the current code is for this case.
-    // Assuming the program doesn't crash, will OSG move on to the 
+    // Assuming the program doesn't crash, will OSG move on to the
     // next search directory, or just give up?
     void osgDB::appendPlatformSpecificLibraryFilePaths(FilePathList& filepath)
@@ -1002 +1002 @@
         // Since this is currently the only Objective-C code in the
         // library, we need an autoreleasepool for obj-c memory management.
-        // If more Obj-C is added, we might move this pool to another 
+        // If more Obj-C is added, we might move this pool to another
         // location so it can be shared. Pools seem to be stackable,
         // so I don't think there will be a problem if multiple pools
@@ -1018 +1018 @@
         // Now setup the other search paths
         // Cocoa has a nice method for tilde expansion.
-        // There's probably a better way of getting this directory, but I 
+        // There's probably a better way of getting this directory, but I
         // can't find the call.
         userSupportDir = [@"~/Library/Application Support/OpenSceneGraph/PlugIns" stringByExpandingTildeInPath];
@@ -1049 +1049 @@
     // ~/Library/Application Support/YourProgram/PlugIns
     // /Library/Application Support/YourProgram/PlugIns
-    // /Network/Library/Application Support/TheProgram/PlugIns 
-    // But I'm not going to worry about it for now because the 
-    // bundle's PlugIns directory is supposed to be the preferred 
+    // /Network/Library/Application Support/TheProgram/PlugIns
+    // But I'm not going to worry about it for now because the
+    // bundle's PlugIns directory is supposed to be the preferred
     // place for this anyway.
     //
@@ -1057 +1057 @@
     // the directory the program resides in,
     // but I'm worried about multiplatform distribution.
-    // Because .so is used by other platforms like Linux, we 
+    // Because .so is used by other platforms like Linux, we
     // could end up loading the wrong binary.
     // I'm not sure how robust the current code is for this case.
-    // Assuming the program doesn't crash, will OSG move on to the 
+    // Assuming the program doesn't crash, will OSG move on to the
     // next search directory, or just give up?
     void osgDB::appendPlatformSpecificLibraryFilePaths(FilePathList& filepath)
@@ -1083 +1083 @@
         //  we are not keeping a reference
         myBundle = CFBundleGetMainBundle();
-        
+
         if(myBundle != NULL)
         {
-            // CFBundleGetMainBundle will return a bundle ref even if 
+            // CFBundleGetMainBundle will return a bundle ref even if
             //  the application isn't part of a bundle, so we need to check
             //  if the path to the bundle ends in ".app" to see if it is a
@@ -1126 +1126 @@
             // Get the URL
             url = CFURLCreateFromFSRef( 0, &f );
-            
+
             if(url)
             {
@@ -1150 +1150 @@
             // Get the URL
             url = CFURLCreateFromFSRef( 0, &f );
-            
+
             if(url)
             {
@@ -1179 +1179 @@
     }
     #endif
-    
-#else   
+
+#else
 
     void osgDB::appendPlatformSpecificLibraryFilePaths(FilePathList& filepath)
@@ -1211 +1211 @@
         // Get the main application bundle
         CFBundleRef mainBundle = CFBundleGetMainBundle();
-        
+
         if (mainBundle != NULL) {
             // Get the parent directory and the resources directory
             std::string bundlePath = GetApplicationBundlePath(mainBundle);
             std::string resourcesPath = GetApplicationResourcesPath(mainBundle);
-            
+
             // check if application is really part of a .app bundle
             if(bundlePath.substr(bundlePath.length() - 4, 4) == std::string(".app"))
@@ -1222 +1222 @@
                 if(resourcesPath != std::string(""))
                     filepath.push_back( resourcesPath );
-                
+
                 std::string parentPath = GetShortenedPath(bundlePath, 1);
                 if(parentPath != std::string(""))