Browse Source

fileutl: Merge Popen variants

tags/devuan/2.0.1+devuan1
Julian Andres Klode 1 year ago
parent
commit
e1024dc0ac
3 changed files with 2 additions and 15 deletions
  1. +0
    -10
      apt-pkg/contrib/fileutl.cc
  2. +1
    -3
      apt-pkg/contrib/fileutl.h
  3. +1
    -2
      debian/libapt-pkg6.0.symbols

+ 0
- 10
apt-pkg/contrib/fileutl.cc View File

@@ -3136,16 +3136,6 @@ bool Rename(std::string From, std::string To) /*{{{*/
return true;
}
/*}}}*/
bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)/*{{{*/
{
return Popen(Args, Fd, Child, Mode, true);
}
/*}}}*/
bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode, bool CaptureStderr)/*{{{*/
{
return Popen(Args, Fd, Child, Mode, CaptureStderr, false);
}
/*}}}*/
bool Popen(const char *Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode, bool CaptureStderr, bool Sandbox) /*{{{*/
{
int fd;


+ 1
- 3
apt-pkg/contrib/fileutl.h View File

@@ -279,9 +279,7 @@ std::vector<std::string> Glob(std::string const &pattern, int flags=0);
* \param Sandbox True if this should run sandboxed
* \return true on success, false on failure with _error set
*/
bool Popen(const char *Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode, bool CaptureStderr, bool Sandbox) APT_HIDDEN;
bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode, bool CaptureStderr);
bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode);
bool Popen(const char *Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode, bool CaptureStderr = true, bool Sandbox = false);

APT_HIDDEN bool OpenConfigurationFileFd(std::string const &File, FileFd &Fd);



+ 1
- 2
debian/libapt-pkg6.0.symbols View File

@@ -1040,7 +1040,7 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER#
(c++)"pkgTagSection::FindB(char const*, bool const&) const@APTPKG_6.0" 1.1~exp1
(c++)"pkgTagSection::Scan(char const*, unsigned long, bool)@APTPKG_6.0" 1.1~exp1
(c++)"StartsWithGPGClearTextSignature(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 1.1~exp1
(c++)"Popen(char const**, FileFd&, int&, FileFd::OpenMode)@APTPKG_6.0" 1.1~exp1
(c++)"Popen(char const**, FileFd&, int&, FileFd::OpenMode, bool, bool)@APTPKG_6.0" 1.9.0~
(c++)"APT::String::Startswith(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 1.1~exp2
(c++)"APT::Upgrade::Upgrade(pkgDepCache&, int, OpProgress*)@APTPKG_6.0" 1.1~exp4
(c++)"pkgProblemResolver::Resolve(bool, OpProgress*)@APTPKG_6.0" 1.1~exp4
@@ -1436,7 +1436,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER#
(c++)"APT::String::Join(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 1.4~beta4
(c++)"debListParser::ParseDepends(char const*, char const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&, bool const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 1.4~beta3
(c++)"pkgTagHash(char const*, unsigned long)@APTPKG_6.0" 1.4~beta1
(c++)"Popen(char const**, FileFd&, int&, FileFd::OpenMode, bool)@APTPKG_6.0" 1.3.1
(c++|optional=std)"void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::emplace_back<char const (&) [4]>(char const (&) [4])@APTPKG_6.0" 1.4~beta4
(c++)"FileFd::ReadLine(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@APTPKG_6.0" 1.5~beta2~
(c++)"MaybeAddAuth(FileFd&, URI&)@APTPKG_6.0" 1.5~beta2~


Loading…
Cancel
Save