Better error reporting for effects

[simgear.git] / simgear / misc / sg_path.cxx

diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx
index 8193a03fe4e7899877ee6d4a237777d1b7cde31d..6055becd8810bcb81caca3f362677a2daa66ae7f 100644 (file)
--- a/simgear/misc/sg_path.cxx
+++ b/simgear/misc/sg_path.cxx
@@ -15,10 +15,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -40,13 +39,8 @@
  * define directory path separators
  */
 
-#if defined( macintosh )
-static const char sgDirPathSep = ':';
-static const char sgDirPathSepBad = '/';
-#else
 static const char sgDirPathSep = '/';
 static const char sgDirPathSepBad = '\\';
-#endif
 
 #if defined( WIN32 ) && !defined(__CYGWIN__)
 static const char sgSearchPathSep = ';';
@@ -166,7 +160,7 @@ string SGPath::base() const {
     }
 }
 
-// get the extention (everything after the final ".")
+// get the extension (everything after the final ".")
 // but make sure no "/" follows the "." character (otherwise it
 // is has to be a directory name containing a ".").
 string SGPath::extension() const {
@@ -194,13 +188,15 @@ bool SGPath::exists() const {
 #endif
 
 
-void SGPath::create_dir( mode_t mode ) {
+int SGPath::create_dir( mode_t mode ) {
     string_list dirlist = sgPathSplit(dir());
+    if ( dirlist.empty() )
+        return -1;
     string path = dirlist[0];
     string_list path_elements = sgPathBranchSplit(path);
     bool absolute = !path.empty() && path[0] == sgDirPathSep;
 
-    int i = 1;
+    unsigned int i = 1;
     SGPath dir = absolute ? string( 1, sgDirPathSep ) : "";
     dir.concat( path_elements[0] );
 #if defined( _MSC_VER) || defined(__MINGW32__)
@@ -215,19 +211,21 @@ void SGPath::create_dir( mode_t mode ) {
         dir.append(path_elements[i]);
     }
     if ( r == 0 ) {
-        return; // Directory already exists
+        return 0; // Directory already exists
     }
     if ( sgMkDir( dir.c_str(), mode) ) {
         SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() );
-        return;
+        return -2;
     }
-    for(;i < path_elements.size(); i++) {
+    for(; i < path_elements.size(); i++) {
         dir.append(path_elements[i]);
         if ( sgMkDir( dir.c_str(), mode) ) {
             SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() );
-            break;
+            return -2;
         }
     }
+
+    return 0;
 }
 
 string_list sgPathBranchSplit( const string &dirpath ) {