Woops, forgot to bump versions for the dependencies on ETL and synfig.

[synfig.git] / ETL / tags / stable / ETL / _stringf.h

diff --git a/ETL/tags/stable/ETL/_stringf.h b/ETL/tags/stable/ETL/_stringf.h
index 5c3642a..b702689 100644 (file)
--- a/ETL/tags/stable/ETL/_stringf.h
+++ b/ETL/tags/stable/ETL/_stringf.h
@@ -1,9 +1,10 @@
 /* =========================================================================
 ** Extended Template and Library
-** stringf Prodecure Implementation
+** stringf Procedure Implementation
 ** $Id$
 **
 ** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2007 Chris Moore
 **
 ** This package is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License as
@@ -49,7 +50,7 @@ _ETL_BEGIN_CDECLS
 #define ETL_NO_THROW throw()
 #endif
 
-#ifdef HAVE_VASPRINTF  // This is the prefered method
+#ifdef HAVE_VASPRINTF  // This is the preferred method
  extern int vasprintf(char **,const char *,va_list)ETL_NO_THROW;
 #else
 
@@ -79,7 +80,7 @@ _ETL_BEGIN_NAMESPACE
 inline std::string
 vstrprintf(const char *format, va_list args)
 {
-#ifdef HAVE_VASPRINTF  // This is the prefered method (and safest)
+#ifdef HAVE_VASPRINTF  // This is the preferred method (and safest)
        char *buffer;
        std::string ret;
        vasprintf(&buffer,format,args);
@@ -150,21 +151,22 @@ basename(const std::string &str)
 {
        std::string::const_iterator iter;
 
-       if(str.end()[-1]==ETL_DIRECTORY_SEPERATOR)
+       if(str.size() == 1 && str[0] == ETL_DIRECTORY_SEPARATOR)
+               return str;
+
+       if(str.end()[-1]==ETL_DIRECTORY_SEPARATOR)
                iter=str.end()-2;
        else
                iter=str.end()-1;
 
        for(;iter!=str.begin();iter--)
-               if(*iter==ETL_DIRECTORY_SEPERATOR)
+               if(*iter==ETL_DIRECTORY_SEPARATOR)
                        break;
 
-       if(iter==str.begin())
-               return str;
-
-       iter++;
+       if (*iter==ETL_DIRECTORY_SEPARATOR)
+               iter++;
 
-       if(str.end()[-1]==ETL_DIRECTORY_SEPERATOR)
+       if(str.end()[-1]==ETL_DIRECTORY_SEPARATOR)
                return std::string(iter,str.end()-1);
 
        return std::string(iter,str.end());
@@ -175,17 +177,23 @@ dirname(const std::string &str)
 {
        std::string::const_iterator iter;
 
-       if(str.end()[-1]==ETL_DIRECTORY_SEPERATOR)
+       if(str.size() == 1 && str[0] == ETL_DIRECTORY_SEPARATOR)
+               return str;
+
+       if(str.end()[-1]==ETL_DIRECTORY_SEPARATOR)
                iter=str.end()-2;
        else
                iter=str.end()-1;
 
        for(;iter!=str.begin();iter--)
-               if(*iter==ETL_DIRECTORY_SEPERATOR)
+               if(*iter==ETL_DIRECTORY_SEPARATOR)
                        break;
 
        if(iter==str.begin())
-               return ".";
+          if (*iter==ETL_DIRECTORY_SEPARATOR)
+                  return "/";
+          else
+                  return ".";
 
        return std::string(str.begin(),iter);
 }
@@ -197,7 +205,7 @@ is_absolute_path(const std::string &path)
        if(path.size()>=3 && path[1]==':' && (path[2]=='\\' || path[2]=='/'))
                return true;
 #endif
-       if(!path.empty() && path[0]==ETL_DIRECTORY_SEPERATOR)
+       if(!path.empty() && path[0]==ETL_DIRECTORY_SEPARATOR)
                return true;
        return false;
 }
@@ -211,7 +219,7 @@ unix_to_local_path(const std::string &path)
                switch(*iter)
                {
                case '/':
-                       ret+=ETL_DIRECTORY_SEPERATOR;
+                       ret+=ETL_DIRECTORY_SEPARATOR;
                        break;
                case '~':
                        ret+='~';
@@ -239,12 +247,12 @@ get_root_from_path(std::string path)
 
        for(iter=path.begin();iter!=path.end();++iter)
        {
-               if(*iter==ETL_DIRECTORY_SEPERATOR)
+               if(*iter==ETL_DIRECTORY_SEPARATOR)
                        break;
                ret+=*iter;
        }
        //if(iter!=path.end())
-               ret+=ETL_DIRECTORY_SEPERATOR;
+               ret+=ETL_DIRECTORY_SEPARATOR;
        return ret;
 }
 
@@ -253,7 +261,7 @@ remove_root_from_path(std::string path)
 {
        while(!path.empty())
        {
-               if(path[0]==ETL_DIRECTORY_SEPERATOR)
+               if(path[0]==ETL_DIRECTORY_SEPARATOR)
                {
                        path.erase(path.begin());
                        return path;
@@ -268,27 +276,26 @@ cleanup_path(std::string path)
 {
        std::string ret;
 
-       while(basename(path)==".")path=dirname(path);
+       while(basename(path)=="."&&path.size()!=1)path=dirname(path);
 
        while(!path.empty())
        {
                std::string dir(get_root_from_path(path));
                if((dir=="../" || dir=="..\\") && ret.size())
                {
-                       ret=dirname(ret)+ETL_DIRECTORY_SEPERATOR;
+                       ret=dirname(ret);
+                       if (*(ret.end()-1)!=ETL_DIRECTORY_SEPARATOR)
+                               ret+=ETL_DIRECTORY_SEPARATOR;
                }
                else if((dir!="./" && dir!=".\\") && dir!=".")
-               {
                        ret+=dir;
-               }
                path=remove_root_from_path(path);
        }
+       if (ret.size()==0)ret+='.';
 
-       // Remove any trailing directory seperators
-       if(ret.size() && ret[ret.size()-1]==ETL_DIRECTORY_SEPERATOR)
-       {
+       // Remove any trailing directory separators
+       if(ret.size() && ret[ret.size()-1]==ETL_DIRECTORY_SEPARATOR)
                ret.erase(ret.begin()+ret.size()-1);
-       }
        return ret;
 }
 
@@ -301,8 +308,7 @@ absolute_path(std::string path)
                return cleanup_path(ret);
        if(is_absolute_path(path))
                return cleanup_path(path);
-       // TODO: This needs to be written
-       return cleanup_path(ret+ETL_DIRECTORY_SEPERATOR+path);
+       return cleanup_path(ret+ETL_DIRECTORY_SEPARATOR+path);
 }
 
 inline std::string
@@ -324,15 +330,11 @@ relative_path(std::string curr_path,std::string dest_path)
        // If we are on windows and the dest path is on a different drive,
        // then there is no way to make a relative path to it.
        if(dest_path.size()>=3 && dest_path[1]==':' && dest_path[0]!=curr_path[0])
-       {
                return dest_path;
-       }
 #endif
 
        if(curr_path==dirname(dest_path))
-       {
                return basename(dest_path);
-       }
 
        while(!dest_path.empty() && !curr_path.empty() && get_root_from_path(dest_path)==get_root_from_path(curr_path))
        {
@@ -342,7 +344,7 @@ relative_path(std::string curr_path,std::string dest_path)
 
        while(!curr_path.empty())
        {
-               dest_path=std::string("..")+ETL_DIRECTORY_SEPERATOR+dest_path;
+               dest_path=std::string("..")+ETL_DIRECTORY_SEPARATOR+dest_path;
                curr_path=remove_root_from_path(curr_path);
        }