OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/file_util.h" | 5 #include "base/file_util.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <io.h> | 8 #include <io.h> |
9 #endif | 9 #endif |
10 #include <stdio.h> | 10 #include <stdio.h> |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 if (contents) | 150 if (contents) |
151 contents->append(buf, std::min(len, max_size - size)); | 151 contents->append(buf, std::min(len, max_size - size)); |
152 | 152 |
153 if ((max_size - size) < len) { | 153 if ((max_size - size) < len) { |
154 read_status = false; | 154 read_status = false; |
155 break; | 155 break; |
156 } | 156 } |
157 | 157 |
158 size += len; | 158 size += len; |
159 } | 159 } |
| 160 read_status = read_status && !ferror(file); |
160 CloseFile(file); | 161 CloseFile(file); |
161 | 162 |
162 return read_status; | 163 return read_status; |
163 } | 164 } |
164 | 165 |
165 bool ReadFileToString(const FilePath& path, std::string* contents) { | 166 bool ReadFileToString(const FilePath& path, std::string* contents) { |
166 return ReadFileToString(path, contents, std::numeric_limits<size_t>::max()); | 167 return ReadFileToString(path, contents, std::numeric_limits<size_t>::max()); |
167 } | 168 } |
168 | 169 |
169 bool IsDirectoryEmpty(const FilePath& dir_path) { | 170 bool IsDirectoryEmpty(const FilePath& dir_path) { |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 if (!PathExists(new_path) && | 251 if (!PathExists(new_path) && |
251 (!have_suffix || !PathExists(FilePath(new_path.value() + suffix)))) { | 252 (!have_suffix || !PathExists(FilePath(new_path.value() + suffix)))) { |
252 return count; | 253 return count; |
253 } | 254 } |
254 } | 255 } |
255 | 256 |
256 return -1; | 257 return -1; |
257 } | 258 } |
258 | 259 |
259 } // namespace base | 260 } // namespace base |
OLD | NEW |