disable https->http redirects in libcurl

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

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 63a999c30abd798e25ca19b091c2ad826954be20..e752e96211ddd54343dd05b0a08082dc1f9d85b1 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -165,6 +165,8 @@ bool DirectoryExists(std::string const &Path) __attrib_const;
 bool CreateDirectory(std::string const &Parent, std::string const &Path);
 time_t GetModificationTime(std::string const &Path);
 
 bool CreateDirectory(std::string const &Parent, std::string const &Path);
 time_t GetModificationTime(std::string const &Path);
 

+std::string GetTempDir();
+

 /** \brief Ensure the existence of the given Path
  *
  *  \param Parent directory of the Path directory - a trailing
 /** \brief Ensure the existence of the given Path
  *
  *  \param Parent directory of the Path directory - a trailing


@@ -184,6 +186,7 @@ void SetNonBlock(int Fd,bool Block);
 bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
 pid_t ExecFork();
 pid_t ExecFork(std::set<int> keep_fds);
 bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
 pid_t ExecFork();
 pid_t ExecFork(std::set<int> keep_fds);

+void MergeKeepFdsFromConfiguration(std::set<int> &keep_fds);

 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 // File string manipulators
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 // File string manipulators