diff options
Diffstat (limited to 'WebCore/loader/FTPDirectoryDocument.cpp')
| -rw-r--r-- | WebCore/loader/FTPDirectoryDocument.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/WebCore/loader/FTPDirectoryDocument.cpp b/WebCore/loader/FTPDirectoryDocument.cpp index 9e1f391..beab88c 100644 --- a/WebCore/loader/FTPDirectoryDocument.cpp +++ b/WebCore/loader/FTPDirectoryDocument.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2007 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,9 +28,12 @@ #include "CharacterNames.h" #include "CString.h" +#include "Element.h" #include "HTMLNames.h" #include "HTMLTableElement.h" +#include "HTMLTableSectionElement.h" #include "HTMLTokenizer.h" +#include "KURL.h" #include "LocalizedStrings.h" #include "Logging.h" #include "FTPDirectoryParser.h" @@ -38,11 +41,12 @@ #include "Settings.h" #include "SharedBuffer.h" #include "Text.h" +#include "XMLTokenizer.h" -// On Win, the threadsafe *_r functions need to be gotten from pthreads. -#if COMPILER(MSVC) && USE(PTHREADS) -#include <pthread.h> -#endif +// On Win, the threadsafe *_r functions need to be gotten from pthreads. +#if COMPILER(MSVC) && USE(PTHREADS) +#include <pthread.h> +#endif #if PLATFORM(QT) #include <QDateTime> @@ -56,7 +60,7 @@ using namespace HTMLNames; class FTPDirectoryTokenizer : public HTMLTokenizer { public: - FTPDirectoryTokenizer(HTMLDocument*); + FTPDirectoryTokenizer(HTMLDocument* doc); virtual bool write(const SegmentedString&, bool appendData); virtual void finish(); @@ -145,7 +149,7 @@ PassRefPtr<Element> FTPDirectoryTokenizer::createTDForFilename(const String& fil { ExceptionCode ec; - String fullURL = m_doc->baseURL().string(); + String fullURL = m_doc->baseURL(); if (fullURL[fullURL.length() - 1] == '/') fullURL.append(filename); else @@ -303,7 +307,10 @@ void FTPDirectoryTokenizer::parseAndAppendOneLine(const String& inputLine) { ListResult result; - FTPEntryType typeResult = parseOneFTPLine(inputLine.latin1().data(), m_listState, result); + DeprecatedString depString = inputLine.deprecatedString(); + const char* line = depString.ascii(); + + FTPEntryType typeResult = parseOneFTPLine(line, m_listState, result); // FTPMiscEntry is a comment or usage statistic which we don't care about, and junk is invalid data - bail in these 2 cases if (typeResult == FTPMiscEntry || typeResult == FTPJunkEntry) |