From 706c713945fd4041ea68e26a0201dd767ee15e88 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 29 Oct 2003 20:59:40 +0000 Subject: [PATCH] CString SetExtension("foo.bar", "") -> "foo" --- stepmania/src/RageUtil.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index 64bb8301da..cd7b3cde50 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -313,11 +313,14 @@ void splitrelpath( const CString &Path, CString& Dir, CString& FName, CString& E } } +/* "foo.bar", "baz" -> "foo.baz" + * "foo", "baz" -> "foo.baz" + * "foo.bar", "" -> "foo" */ CString SetExtension( const CString &path, const CString &ext ) { CString Dir, FName, OldExt; splitpath( path, Dir, FName, OldExt ); - return Dir + FName + "." + ext; + return Dir + FName + (ext.size()? ".":"") + ext; } CString GetExtension( CString sPath )