X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_stringf.h;h=5c3642a356465cf763476d164d9ec6bbe9652c51;hb=8fd07c649f1bdc488aa8e2f9c2a522ca689b798f;hp=61621acef972f804b42c6a208c48be04526b3826;hpb=aefba09c3c4e8f1165663162c77a030dc5b7af56;p=synfig.git

diff --git a/ETL/trunk/ETL/_stringf.h b/ETL/trunk/ETL/_stringf.h
index 61621ac..5c3642a 100644
--- a/ETL/trunk/ETL/_stringf.h
+++ b/ETL/trunk/ETL/_stringf.h
@@ -1,7 +1,7 @@
 /* =========================================================================
 ** Extended Template and Library
 ** stringf Prodecure Implementation
-** $Id: _stringf.h,v 1.1.1.1 2005/01/04 01:31:48 darco Exp $
+** $Id$
 **
 ** Copyright (c) 2002 Robert B. Quattlebaum Jr.
 **
@@ -31,6 +31,7 @@
 
 #include <string>
 #include <cstdarg>
+#include <cstdlib>
 
 /* === M A C R O S ========================================================= */
 
@@ -53,11 +54,7 @@ _ETL_BEGIN_CDECLS
 #else
 
 # ifdef HAVE_VSNPRINTF	// This is the secondary method
-#  if defined(__CYGWIN__)  || defined(_WIN32)
-extern int vsnprintf(char *,unsigned int,const char*,va_list)ETL_NO_THROW;
-#  else
-extern int vsnprintf(char *,int,const char*,va_list)ETL_NO_THROW;
-#  endif
+ extern int vsnprintf(char *,size_t,const char*,va_list)ETL_NO_THROW;
 # endif
 
 #endif
@@ -199,12 +196,10 @@ is_absolute_path(const std::string &path)
 #ifdef WIN32
 	if(path.size()>=3 && path[1]==':' && (path[2]=='\\' || path[2]=='/'))
 		return true;
-	return false;
-#else
+#endif
 	if(!path.empty() && path[0]==ETL_DIRECTORY_SEPERATOR)
 		return true;
 	return false;
-#endif	
 }
 
 inline std::string
@@ -241,7 +236,7 @@ get_root_from_path(std::string path)
 {
 	std::string ret;
 	std::string::const_iterator iter;
-	
+
 	for(iter=path.begin();iter!=path.end();++iter)
 	{
 		if(*iter==ETL_DIRECTORY_SEPERATOR)
@@ -274,21 +269,21 @@ cleanup_path(std::string path)
 	std::string ret;
 
 	while(basename(path)==".")path=dirname(path);
-	
+
 	while(!path.empty())
 	{
 		std::string dir(get_root_from_path(path));
-		if(dir=="../" && ret.size())
+		if((dir=="../" || dir=="..\\") && ret.size())
 		{
 			ret=dirname(ret)+ETL_DIRECTORY_SEPERATOR;
 		}
-		else if(dir!="./" && dir!=".")
+		else if((dir!="./" && dir!=".\\") && dir!=".")
 		{
 			ret+=dir;
 		}
 		path=remove_root_from_path(path);
 	}
-	
+
 	// Remove any trailing directory seperators
 	if(ret.size() && ret[ret.size()-1]==ETL_DIRECTORY_SEPERATOR)
 	{
@@ -301,7 +296,7 @@ inline std::string
 absolute_path(std::string path)
 {
 	std::string ret(current_working_directory());
-	
+
 	if(path.empty())
 		return cleanup_path(ret);
 	if(is_absolute_path(path))
@@ -312,14 +307,14 @@ absolute_path(std::string path)
 
 inline std::string
 relative_path(std::string curr_path,std::string dest_path)
-{	
+{
 	// If dest_path is already a relative path,
 	// then there is no need to do anything.
 	if(!is_absolute_path(dest_path))
 		dest_path=absolute_path(dest_path);
 	else
 		dest_path=cleanup_path(dest_path);
-	
+
 	if(!is_absolute_path(curr_path))
 		curr_path=absolute_path(curr_path);
 	else
@@ -338,7 +333,7 @@ relative_path(std::string curr_path,std::string 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))
 	{
 		dest_path=remove_root_from_path(dest_path);
@@ -347,10 +342,10 @@ relative_path(std::string curr_path,std::string dest_path)
 
 	while(!curr_path.empty())
 	{
-		dest_path="../"+dest_path;
+		dest_path=std::string("..")+ETL_DIRECTORY_SEPERATOR+dest_path;
 		curr_path=remove_root_from_path(curr_path);
 	}
-	
+
 	return dest_path;
 }