summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 17:07:17 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 17:07:17 +0000
commit5a224394f44fdfd9bf82ea58d5497b8d0551e113 (patch)
treec719c3c24a3f55de871f0565a0d5ca2d7df484d5 /net
parent893c7a1de54c18e59ca9e4b87f0aa85c0140a344 (diff)
downloadchromium_src-5a224394f44fdfd9bf82ea58d5497b8d0551e113.zip
chromium_src-5a224394f44fdfd9bf82ea58d5497b8d0551e113.tar.gz
chromium_src-5a224394f44fdfd9bf82ea58d5497b8d0551e113.tar.bz2
Move Mozilla FTP LIST response parsing code to net/third_party directory.
This should make licensing terms and third-party origin of the code more clear. TEST=none BUG=none Review URL: http://codereview.chromium.org/179041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/net.gyp4
-rw-r--r--net/third_party/parseftp/ParseFTPList.cpp (renamed from net/ftp/ftp_directory_parser.cc)6
-rw-r--r--net/third_party/parseftp/ParseFTPList.h (renamed from net/ftp/ftp_directory_parser.h)11
-rw-r--r--net/third_party/parseftp/README.chromium8
-rw-r--r--net/url_request/url_request_new_ftp_job.cc2
5 files changed, 16 insertions, 15 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 642489c..376bc1c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -197,8 +197,6 @@
'ftp/ftp_auth_cache.h',
'ftp/ftp_ctrl_response_buffer.cc',
'ftp/ftp_ctrl_response_buffer.h',
- 'ftp/ftp_directory_parser.cc',
- 'ftp/ftp_directory_parser.h',
'ftp/ftp_network_layer.cc',
'ftp/ftp_network_layer.h',
'ftp/ftp_network_session.h',
@@ -321,6 +319,8 @@
'socket/tcp_client_socket_win.cc',
'socket/tcp_client_socket_win.h',
'socket/tcp_pinger.h',
+ 'third_party/parseftp/ParseFTPList.cpp',
+ 'third_party/parseftp/ParseFTPList.h',
'url_request/url_request.cc',
'url_request/url_request.h',
'url_request/url_request_about_job.cc',
diff --git a/net/ftp/ftp_directory_parser.cc b/net/third_party/parseftp/ParseFTPList.cpp
index 4c2cd04..91da73c 100644
--- a/net/ftp/ftp_directory_parser.cc
+++ b/net/third_party/parseftp/ParseFTPList.cpp
@@ -1,7 +1,3 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
// Version: MPL 1.1/GPL 2.0/LGPL 2.1
//
// The contents of this file are subject to the Mozilla Public License Version
@@ -39,7 +35,7 @@
// Derived from:
// mozilla/netwerk/streamconv/converters/ParseFTPList.cpp revision 1.10
-#include "net/ftp/ftp_directory_parser.h"
+#include "net/third_party/parseftp/ParseFTPList.h"
#include "base/basictypes.h"
#include "base/string_util.h"
diff --git a/net/ftp/ftp_directory_parser.h b/net/third_party/parseftp/ParseFTPList.h
index ff7bc40..341e517 100644
--- a/net/ftp/ftp_directory_parser.h
+++ b/net/third_party/parseftp/ParseFTPList.h
@@ -1,8 +1,5 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
// Version: MPL 1.1/GPL 2.0/LGPL 2.1
+//
// The contents of this file are subject to the Mozilla Public License Version
// 1.1 (the "License"); you may not use this file except in compliance with
// the License. You may obtain a copy of the License at
@@ -38,8 +35,8 @@
// mozilla/netwerk/streamconv/converters/ParseFTPList.h revision 1.3
-#ifndef NET_FTP_FTP_DIRECTORY_PARSER_H_
-#define NET_FTP_FTP_DIRECTORY_PARSER_H_
+#ifndef NET_THIRD_PARTY_PARSEFTP_FTP_DIRECTORY_PARSER_H_
+#define NET_THIRD_PARTY_PARSEFTP_FTP_DIRECTORY_PARSER_H_
#include "base/time.h"
@@ -131,4 +128,4 @@ LineType ParseFTPLine(const char *line,
} // namespace net
-#endif // NET_FTP_FTP_DIRECTORY_PARSER_H_
+#endif // NET_THIRD_PARTY_PARSEFTP_FTP_DIRECTORY_PARSER_H_
diff --git a/net/third_party/parseftp/README.chromium b/net/third_party/parseftp/README.chromium
new file mode 100644
index 0000000..18feabf69
--- /dev/null
+++ b/net/third_party/parseftp/README.chromium
@@ -0,0 +1,8 @@
+This directory contains Mozilla FTP LIST response parsing routines.
+
+The original code location was mozilla/netwerk/streamconv/converters/ParseFTPList.{cpp,h}
+
+List of changes made to original code:
+ - style adjustment for Chromium
+ - wrapped the routines in net namespace
+ - changed PRExplodedTime to base::Time::Exploded
diff --git a/net/url_request/url_request_new_ftp_job.cc b/net/url_request/url_request_new_ftp_job.cc
index 251602c..a6b5e9f 100644
--- a/net/url_request/url_request_new_ftp_job.cc
+++ b/net/url_request/url_request_new_ftp_job.cc
@@ -12,10 +12,10 @@
#include "net/base/escape.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
-#include "net/ftp/ftp_directory_parser.h"
#include "net/ftp/ftp_response_info.h"
#include "net/ftp/ftp_server_type_histograms.h"
#include "net/ftp/ftp_transaction_factory.h"
+#include "net/third_party/parseftp/ParseFTPList.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_error_job.h"