Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(518)

Side by Side Diff: runtime/bin/file_linux.cc

Issue 115183002: Fix 64-bit linux build after file-copy change. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/bin/file_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "platform/globals.h" 5 #include "platform/globals.h"
6 #if defined(TARGET_OS_LINUX) 6 #if defined(TARGET_OS_LINUX)
7 7
8 #include "bin/file.h" 8 #include "bin/file.h"
9 9
10 #include <errno.h> // NOLINT 10 #include <errno.h> // NOLINT
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 int new_fd = TEMP_FAILURE_RETRY( 235 int new_fd = TEMP_FAILURE_RETRY(
236 open64(new_path, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, st.st_mode)); 236 open64(new_path, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, st.st_mode));
237 if (new_fd < 0) { 237 if (new_fd < 0) {
238 VOID_TEMP_FAILURE_RETRY(close(old_fd)); 238 VOID_TEMP_FAILURE_RETRY(close(old_fd));
239 return false; 239 return false;
240 } 240 }
241 off64_t offset = 0; 241 off64_t offset = 0;
242 int bytes = 1; 242 int bytes = 1;
243 while (bytes > 0) { 243 while (bytes > 0) {
244 // Loop to ensure we copy everything, and not only up to 2GB. 244 // Loop to ensure we copy everything, and not only up to 2GB.
245 bytes = TEMP_FAILURE_RETRY(sendfile64(new_fd, old_fd, &offset, -1)); 245 bytes = TEMP_FAILURE_RETRY(
246 sendfile64(new_fd, old_fd, &offset, kMaxUint32));
246 } 247 }
247 if (bytes < 0) { 248 if (bytes < 0) {
248 int e = errno; 249 int e = errno;
249 VOID_TEMP_FAILURE_RETRY(close(old_fd)); 250 VOID_TEMP_FAILURE_RETRY(close(old_fd));
250 VOID_TEMP_FAILURE_RETRY(close(new_fd)); 251 VOID_TEMP_FAILURE_RETRY(close(new_fd));
251 VOID_TEMP_FAILURE_RETRY(unlink(new_path)); 252 VOID_TEMP_FAILURE_RETRY(unlink(new_path));
252 errno = e; 253 errno = e;
253 return false; 254 return false;
254 } 255 }
255 return true; 256 return true;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 return (file_1_info.st_ino == file_2_info.st_ino && 394 return (file_1_info.st_ino == file_2_info.st_ino &&
394 file_1_info.st_dev == file_2_info.st_dev) ? 395 file_1_info.st_dev == file_2_info.st_dev) ?
395 File::kIdentical : 396 File::kIdentical :
396 File::kDifferent; 397 File::kDifferent;
397 } 398 }
398 399
399 } // namespace bin 400 } // namespace bin
400 } // namespace dart 401 } // namespace dart
401 402
402 #endif // defined(TARGET_OS_LINUX) 403 #endif // defined(TARGET_OS_LINUX)
OLDNEW
« no previous file with comments | « runtime/bin/file_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698