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

Side by Side Diff: net/ftp/ftp_util.cc

Issue 2558143003: Use UTC rather than local time for interpreting FTP listing dates. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_vms.cc ('k') | net/ftp/ftp_util_unittest.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "net/ftp/ftp_util.h" 5 #include "net/ftp/ftp_util.h"
6 6
7 #include <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/i18n/case_conversion.h" 10 #include "base/i18n/case_conversion.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 return false; 265 return false;
266 } 266 }
267 if (!base::StringToInt( 267 if (!base::StringToInt(
268 StringPiece16(rest.begin() + colon_pos + 1, rest.end()), 268 StringPiece16(rest.begin() + colon_pos + 1, rest.end()),
269 &time_exploded.minute)) { 269 &time_exploded.minute)) {
270 return false; 270 return false;
271 } 271 }
272 272
273 // Guess the year. 273 // Guess the year.
274 base::Time::Exploded current_exploded; 274 base::Time::Exploded current_exploded;
275 current_time.LocalExplode(&current_exploded); 275 current_time.UTCExplode(&current_exploded);
276 276
277 // If it's not possible for the parsed date to be in the current year, 277 // If it's not possible for the parsed date to be in the current year,
278 // use the previous year. 278 // use the previous year.
279 if (time_exploded.month > current_exploded.month || 279 if (time_exploded.month > current_exploded.month ||
280 (time_exploded.month == current_exploded.month && 280 (time_exploded.month == current_exploded.month &&
281 time_exploded.day_of_month > current_exploded.day_of_month)) { 281 time_exploded.day_of_month > current_exploded.day_of_month)) {
282 time_exploded.year = current_exploded.year - 1; 282 time_exploded.year = current_exploded.year - 1;
283 } else { 283 } else {
284 time_exploded.year = current_exploded.year; 284 time_exploded.year = current_exploded.year;
285 } 285 }
286 } 286 }
287 287
288 // We don't know the time zone of the listing, so just use local time. 288 // We don't know the time zone of the listing, so just use UTC.
289 *result = base::Time::FromLocalExploded(time_exploded); 289 *result = base::Time::FromUTCExploded(time_exploded);
290 return true; 290 return true;
291 } 291 }
292 292
293 // static 293 // static
294 bool FtpUtil::WindowsDateListingToTime(const base::string16& date, 294 bool FtpUtil::WindowsDateListingToTime(const base::string16& date,
295 const base::string16& time, 295 const base::string16& time,
296 base::Time* result) { 296 base::Time* result) {
297 base::Time::Exploded time_exploded = { 0 }; 297 base::Time::Exploded time_exploded = { 0 };
298 298
299 // Date should be in format MM-DD-YY[YY]. 299 // Date should be in format MM-DD-YY[YY].
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 if (time_exploded.hour < 12) 341 if (time_exploded.hour < 12)
342 time_exploded.hour += 12; 342 time_exploded.hour += 12;
343 } else if (base::EqualsASCII(am_or_pm, "AM")) { 343 } else if (base::EqualsASCII(am_or_pm, "AM")) {
344 if (time_exploded.hour == 12) 344 if (time_exploded.hour == 12)
345 time_exploded.hour = 0; 345 time_exploded.hour = 0;
346 } else { 346 } else {
347 return false; 347 return false;
348 } 348 }
349 } 349 }
350 350
351 // We don't know the time zone of the server, so just use local time. 351 // We don't know the time zone of the server, so just use UTC.
352 *result = base::Time::FromLocalExploded(time_exploded); 352 *result = base::Time::FromUTCExploded(time_exploded);
353 return true; 353 return true;
354 } 354 }
355 355
356 // static 356 // static
357 base::string16 FtpUtil::GetStringPartAfterColumns(const base::string16& text, 357 base::string16 FtpUtil::GetStringPartAfterColumns(const base::string16& text,
358 int columns) { 358 int columns) {
359 base::i18n::UTF16CharIterator iter(&text); 359 base::i18n::UTF16CharIterator iter(&text);
360 360
361 for (int i = 0; i < columns; i++) { 361 for (int i = 0; i < columns; i++) {
362 // Skip the leading whitespace. 362 // Skip the leading whitespace.
363 while (!iter.end() && u_isspace(iter.get())) 363 while (!iter.end() && u_isspace(iter.get()))
364 iter.Advance(); 364 iter.Advance();
365 365
366 // Skip the actual text of i-th column. 366 // Skip the actual text of i-th column.
367 while (!iter.end() && !u_isspace(iter.get())) 367 while (!iter.end() && !u_isspace(iter.get()))
368 iter.Advance(); 368 iter.Advance();
369 } 369 }
370 370
371 base::string16 result(text.substr(iter.array_pos())); 371 base::string16 result(text.substr(iter.array_pos()));
372 base::TrimWhitespace(result, base::TRIM_ALL, &result); 372 base::TrimWhitespace(result, base::TRIM_ALL, &result);
373 return result; 373 return result;
374 } 374 }
375 375
376 } // namespace net 376 } // namespace net
OLDNEW
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_vms.cc ('k') | net/ftp/ftp_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698