| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 #include "SkOSFile.h" | 7 #include "SkOSFile.h" |
| 8 | 8 |
| 9 SkString SkOSPath::Join(const char *rootPath, const char *relativePath) { | 9 SkString SkOSPath::Join(const char *rootPath, const char *relativePath) { |
| 10 SkString result(rootPath); | 10 SkString result(rootPath); |
| 11 if (!result.endsWith(SkPATH_SEPARATOR) && !result.isEmpty()) { | 11 if (!result.endsWith(SkPATH_SEPARATOR) && !result.isEmpty()) { |
| 12 result.appendUnichar(SkPATH_SEPARATOR); | 12 result.appendUnichar(SkPATH_SEPARATOR); |
| 13 } | 13 } |
| 14 result.append(relativePath); | 14 result.append(relativePath); |
| 15 return result; | 15 return result; |
| 16 } | 16 } |
| 17 | 17 |
| 18 SkString SkOSPath::Basename(const char* fullPath) { | 18 SkString SkOSPath::Basename(const char* fullPath) { |
| 19 if (!fullPath) { | 19 if (!fullPath) { |
| 20 return SkString(); | 20 return SkString(); |
| 21 } | 21 } |
| 22 const char* filename = strrchr(fullPath, SkPATH_SEPARATOR); | 22 const char* filename = strrchr(fullPath, SkPATH_SEPARATOR); |
| 23 if (NULL == filename) { | 23 if (nullptr == filename) { |
| 24 filename = fullPath; | 24 filename = fullPath; |
| 25 } else { | 25 } else { |
| 26 ++filename; | 26 ++filename; |
| 27 } | 27 } |
| 28 return SkString(filename); | 28 return SkString(filename); |
| 29 } | 29 } |
| 30 | 30 |
| 31 SkString SkOSPath::Dirname(const char* fullPath) { | 31 SkString SkOSPath::Dirname(const char* fullPath) { |
| 32 if (!fullPath) { | 32 if (!fullPath) { |
| 33 return SkString(); | 33 return SkString(); |
| 34 } | 34 } |
| 35 const char* end = strrchr(fullPath, SkPATH_SEPARATOR); | 35 const char* end = strrchr(fullPath, SkPATH_SEPARATOR); |
| 36 if (NULL == end) { | 36 if (nullptr == end) { |
| 37 return SkString(); | 37 return SkString(); |
| 38 } | 38 } |
| 39 if (end == fullPath) { | 39 if (end == fullPath) { |
| 40 SkASSERT(fullPath[0] == SkPATH_SEPARATOR); | 40 SkASSERT(fullPath[0] == SkPATH_SEPARATOR); |
| 41 ++end; | 41 ++end; |
| 42 } | 42 } |
| 43 return SkString(fullPath, end - fullPath); | 43 return SkString(fullPath, end - fullPath); |
| 44 } | 44 } |
| OLD | NEW |