implement socks5h proxy support for http method

[apt.git] / apt-pkg / contrib / fileutl.h

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 13e9c610fd6ab7eb8a3662846662ed84d19c6170..4a1676dc21867f95294a1c14e6ae9d01b0f93851 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -23,9 +23,6 @@
 
 #include <apt-pkg/macros.h>
 #include <apt-pkg/aptconfiguration.h>
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-#include <apt-pkg/string_view.h>
-#endif
 
 #include <string>
 #include <vector>
@@ -89,12 +86,10 @@ class FileFd
       return Read(To,Size);
    }   
    bool Read(void *To,unsigned long long Size,unsigned long long *Actual = 0);
+   bool static Read(int const Fd, void *To, unsigned long long Size, unsigned long long * const Actual = 0);
    char* ReadLine(char *To, unsigned long long const Size);
    bool Flush();
    bool Write(const void *From,unsigned long long Size);
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-   APT_HIDDEN bool Write(APT::StringView From) { return Write(From.data(), From.size()); }
-#endif
    bool static Write(int Fd, const void *From, unsigned long long Size);
    bool Seek(unsigned long long To);
    bool Skip(unsigned long long To);
@@ -240,6 +235,8 @@ std::string flCombine(std::string Dir,std::string File);
 /** \brief Takes a file path and returns the absolute path
  */
 std::string flAbsPath(std::string File);
+/** \brief removes superfluous /./ and // from path */
+APT_HIDDEN std::string flNormalize(std::string file);
 
 // simple c++ glob
 std::vector<std::string> Glob(std::string const &pattern, int flags=0);