Add path utils, plus a test for it.

tools/skimage_main.cpp

Index: tools/skimage_main.cpp
diff --git a/tools/skimage_main.cpp b/tools/skimage_main.cpp
index 9739ced49d13df296d94f3ff19fb6dc0c0b5e5f1..83fae0343beaeb79c1780d64d877ffaf6fddac61 100644
--- a/tools/skimage_main.cpp
+++ b/tools/skimage_main.cpp
@@ -15,6 +15,7 @@
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"
+#include "SkOSPathUtils.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkTArray.h"
@@ -70,27 +71,10 @@ static SkImageDecoder::Format guess_format_from_suffix(const char suffix[]) {
     return SkImageDecoder::kUnknown_Format;
 }
 
-/**
- *  Return the name of the file, ignoring the directory structure.
- *  Does not create a new string.
- *  @param fullPath Full path to the file.
- *  @return string The basename of the file - anything beyond the final slash, or the full name
- *      if there is no slash.
- *  TODO: Might this be useful as a utility function in SkOSFile? Would it be more appropriate to
- *  create a new string?
- */
-static const char* SkBasename(const char* fullPath) {
-    const char* filename = strrchr(fullPath, SkPATH_SEPARATOR);
-    if (NULL == filename || *++filename == '\0') {
-        filename = fullPath;
-    }
-    return filename;
-}
-
 static void make_outname(SkString* dst, const char outDir[], const char src[],
                          const char suffix[]) {
-    const char* basename = SkBasename(src);
-    dst->set(skiagm::SkPathJoin(outDir, basename));
+    SkString basename = SkBasename(src);
+    dst->set(SkPathJoin(outDir, basename.c_str()));
     if (!dst->endsWith(suffix)) {
         const char* cstyleDst = dst->c_str();
         const char* dot = strrchr(cstyleDst, '.');
@@ -273,8 +257,7 @@ static bool write_subset(const char* writePath, const char* filename, const char
     SkASSERT(bitmapFromDecodeSubset != NULL);
 
     // Create a subdirectory to hold the results of decodeSubset.
-    // TODO: Move SkPathJoin into SkOSFile.h
-    SkString dir = skiagm::SkPathJoin(writePath, "subsets");
+    SkString dir = SkPathJoin(writePath, "subsets");
     if (!sk_mkdir(dir.c_str())) {
         gFailedSubsetDecodes.push_back().printf("Successfully decoded %s from %s, but failed to "
                                                 "create a directory to write to.", subsetDim,
@@ -299,7 +282,7 @@ static bool write_subset(const char* writePath, const char* filename, const char
         return false;
     }
 
-    SkString dirExtracted = skiagm::SkPathJoin(writePath, "extracted");
+    SkString dirExtracted = SkPathJoin(writePath, "extracted");
     if (!sk_mkdir(dirExtracted.c_str())) {
         gFailedSubsetDecodes.push_back().printf("Successfully decoded %s from %s, but failed to "
                                                 "create a directory for extractSubset comparison.",
@@ -336,7 +319,8 @@ static void decodeFileAndWrite(const char srcPath[], const SkString* writePath)
     }
 
     // Create a string representing just the filename itself, for use in json expectations.
-    const char* filename = SkBasename(srcPath);
+    SkString basename = SkBasename(srcPath);
+    const char* filename = basename.c_str();

[epoger, 2013/05/23 15:51:13]

I think you could just do this:

const char* filename = SkBasename(srcPath).c_str();

[scroggo, 2013/05/24 16:23:37]

I don't think so. The returned result from c_str() depends on the SkString
sticking around.

[epoger, 2013/05/24 16:42:55]

Ah, I think you're right.  In the code I suggested, SkBasename(srcPath) would be
assigned to an anonymous variable, which would have "expression" scope.  Thus,
the "filename" pointer would be pointing into no-longer-reserved memory at the
end of this C++ expression.  Not good.

See http://www.learncpp.com/cpp-tutorial/814-anonymous-variables-and-objects/

 
     if (compare_to_expectations_if_necessary(bitmap, filename, &gDecodeFailures)) {
         gSuccessfulDecodes.push_back().printf("%s [%d %d]", srcPath, bitmap.width(),