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

Issue 11470035: FTP: correctly handle newlines in file names (Closed)

Created:
8 years ago by Paweł Hajdan Jr.
Modified:
8 years ago
Reviewers:
mmenke
CC:
chromium-reviews, cbentzel+watch_chromium.org, darin-cc_chromium.org, Paweł Hajdan Jr.
Visibility:
Public.

Description

FTP: correctly handle newlines in file names This converts all .expected test files to CRLF line endings. BUG=164724 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=172656

Patch Set 1 #

Total comments: 5

Patch Set 2 : removed \r #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2129 lines, -1988 lines) Patch
M net/data/ftp/dir-listing-ls-1.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-1-utf8.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-10.expected View 1 chunk +80 lines, -80 lines 0 comments Download
M net/data/ftp/dir-listing-ls-11.expected View 1 chunk +62 lines, -62 lines 0 comments Download
M net/data/ftp/dir-listing-ls-12.expected View 1 chunk +62 lines, -62 lines 0 comments Download
M net/data/ftp/dir-listing-ls-13.expected View 1 chunk +26 lines, -26 lines 0 comments Download
M net/data/ftp/dir-listing-ls-14.expected View 1 chunk +26 lines, -26 lines 0 comments Download
M net/data/ftp/dir-listing-ls-15.expected View 1 chunk +35 lines, -35 lines 0 comments Download
M net/data/ftp/dir-listing-ls-16.expected View 1 chunk +62 lines, -62 lines 0 comments Download
M net/data/ftp/dir-listing-ls-18.expected View 1 chunk +26 lines, -26 lines 0 comments Download
M net/data/ftp/dir-listing-ls-19.expected View 1 chunk +8 lines, -8 lines 0 comments Download
M net/data/ftp/dir-listing-ls-2.expected View 1 chunk +62 lines, -62 lines 0 comments Download
M net/data/ftp/dir-listing-ls-24.expected View 1 chunk +8 lines, -8 lines 0 comments Download
M net/data/ftp/dir-listing-ls-25.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-26.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-27.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-28.expected View 1 chunk +44 lines, -45 lines 0 comments Download
M net/data/ftp/dir-listing-ls-29.expected View 1 chunk +62 lines, -62 lines 0 comments Download
M net/data/ftp/dir-listing-ls-3.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-30.expected View 1 chunk +8 lines, -8 lines 0 comments Download
A net/data/ftp/dir-listing-ls-31 View 1 chunk +15 lines, -0 lines 0 comments Download
A net/data/ftp/dir-listing-ls-31.expected View 1 chunk +118 lines, -0 lines 0 comments Download
M net/data/ftp/dir-listing-ls-4.expected View 1 chunk +80 lines, -80 lines 0 comments Download
M net/data/ftp/dir-listing-ls-5.expected View 1 chunk +8 lines, -8 lines 0 comments Download
M net/data/ftp/dir-listing-ls-6.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-7.expected View 1 chunk +53 lines, -53 lines 0 comments Download
M net/data/ftp/dir-listing-ls-9.expected View 1 chunk +26 lines, -26 lines 0 comments Download
M net/data/ftp/dir-listing-netware-1.expected View 1 chunk +17 lines, -17 lines 0 comments Download
M net/data/ftp/dir-listing-netware-2.expected View 1 chunk +26 lines, -26 lines 0 comments Download
M net/data/ftp/dir-listing-netware-3.expected View 1 chunk +188 lines, -188 lines 0 comments Download
M net/data/ftp/dir-listing-vms-1.expected View 1 chunk +98 lines, -98 lines 0 comments Download
M net/data/ftp/dir-listing-vms-2.expected View 1 chunk +260 lines, -260 lines 0 comments Download
M net/data/ftp/dir-listing-vms-4.expected View 1 chunk +71 lines, -71 lines 0 comments Download
M net/data/ftp/dir-listing-vms-5.expected View 1 chunk +35 lines, -36 lines 0 comments Download
M net/data/ftp/dir-listing-windows-1.expected View 1 chunk +17 lines, -17 lines 0 comments Download
M net/data/ftp/dir-listing-windows-2.expected View 1 chunk +143 lines, -143 lines 0 comments Download
M net/ftp/ftp_directory_listing_parser.cc View 1 4 chunks +15 lines, -8 lines 0 comments Download
M net/ftp/ftp_directory_listing_parser_unittest.cc View 3 chunks +17 lines, -14 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
Paweł Hajdan Jr.
8 years ago (2012-12-11 23:44:18 UTC) #1
mmenke
https://codereview.chromium.org/11470035/diff/1/net/ftp/ftp_directory_listing_parser.cc File net/ftp/ftp_directory_listing_parser.cc (right): https://codereview.chromium.org/11470035/diff/1/net/ftp/ftp_directory_listing_parser.cc#newcode98 net/ftp/ftp_directory_listing_parser.cc:98: const char* kNewlineSeparators[] = { "\n", "\r\n", "\r" }; ...
8 years ago (2012-12-12 17:20:44 UTC) #2
Paweł Hajdan Jr.
PTAL https://codereview.chromium.org/11470035/diff/1/net/ftp/ftp_directory_listing_parser.cc File net/ftp/ftp_directory_listing_parser.cc (right): https://codereview.chromium.org/11470035/diff/1/net/ftp/ftp_directory_listing_parser.cc#newcode98 net/ftp/ftp_directory_listing_parser.cc:98: const char* kNewlineSeparators[] = { "\n", "\r\n", "\r" ...
8 years ago (2012-12-12 18:26:19 UTC) #3
mmenke
8 years ago (2012-12-12 18:36:12 UTC) #4
LGTM

https://codereview.chromium.org/11470035/diff/1/net/ftp/ftp_directory_listing...
File net/ftp/ftp_directory_listing_parser.cc (right):

https://codereview.chromium.org/11470035/diff/1/net/ftp/ftp_directory_listing...
net/ftp/ftp_directory_listing_parser.cc:98: const char* kNewlineSeparators[] = {
"\n", "\r\n", "\r" };
On 2012/12/12 18:26:19, Paweł Hajdan Jr. wrote:
> On 2012/12/12 17:20:44, Matt Menke wrote:
> > If we run into a server that uses "\r"-style linebreaks, with no "total
blah"
> > prefix, and try to parse it with "\n" style linebreaks, won't we just treat
it
> > as one file with a really long name?
> 
> Good point. I just removed "\r" then. I haven't yet seen a server sending
these
> line endings (and I've done research to check as many servers as possible). We
> can worry about that when it happens, not in advance.

Oops - didn't see the bug.

Powered by Google App Engine
This is Rietveld 408576698