Treat empty directory properly in skimage.

tools/skimage_main.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm_expectations.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 483 matching lines @@
 
     if (FLAGS_writePath.count() == 1) {
         outDir.set(FLAGS_writePath[0]);
         append_path_separator_if_necessary(&outDir);
         outDirPtr = &outDir;
     } else {
         outDirPtr = NULL;
     }
 
     for (int i = 0; i < FLAGS_readPath.count(); i++) {
-        if (strlen(FLAGS_readPath[i]) < 1) {
+        const char* readPath = FLAGS_readPath[i];
+        if (strlen(readPath) < 1) {
             break;
         }
-        SkOSFile::Iter iter(FLAGS_readPath[i]);
-        SkString filename;
-        if (iter.next(&filename)) {
-            SkString directory(FLAGS_readPath[i]);
-            append_path_separator_if_necessary(&directory);
-            do {
-                SkString fullname(directory);
-                fullname.append(filename);
+        if (sk_isdir(readPath)) {
+            const char* dir = readPath;
+            SkOSFile::Iter iter(dir);
+            SkString filename;
+            while (iter.next(&filename)) {
+                SkString fullname = SkOSPath::SkPathJoin(dir, filename.c_str());
                 decodeFileAndWrite(fullname.c_str(), outDirPtr);
-            } while (iter.next(&filename));
-        } else {
-            decodeFileAndWrite(FLAGS_readPath[i], outDirPtr);
+            }
+        } else if (sk_exists(readPath)) {
+            decodeFileAndWrite(readPath, outDirPtr);
         }
     }
 
     if (!FLAGS_createExpectationsPath.isEmpty()) {
         // Use an empty value for everything besides expectations, since the reader only cares
         // about the expectations.
         Json::Value nullValue;
         Json::Value root = skiagm::CreateJsonTree(gExpectationsToWrite, nullValue, nullValue,
                                                   nullValue, nullValue);
         std::string jsonStdString = root.toStyledString();
@@ skipping 15 matching lines @@
     }
 
     return failed ? -1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif