2017-07-23 23:42:07 +02:00
|
|
|
diff -u -r ../apt-1.4.7/apt-pkg/contrib/fileutl.cc ./apt-pkg/contrib/fileutl.cc
|
|
|
|
|
--- ../apt-1.4.7/apt-pkg/contrib/fileutl.cc 2017-07-13 23:45:39.000000000 +0200
|
2017-09-17 20:51:20 +02:00
|
|
|
+++ ./apt-pkg/contrib/fileutl.cc 2017-09-17 20:46:39.567888481 +0200
|
|
|
|
|
@@ -46,7 +46,9 @@
|
|
|
|
|
#include <dirent.h>
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
+#ifndef __ANDROID__
|
|
|
|
|
#include <glob.h>
|
|
|
|
|
+#endif
|
|
|
|
|
#include <pwd.h>
|
|
|
|
|
#include <grp.h>
|
|
|
|
|
|
|
|
|
|
@@ -2752,6 +2754,7 @@
|
2017-07-23 23:42:07 +02:00
|
|
|
}
|
|
|
|
|
/*}}}*/
|
|
|
|
|
|
|
|
|
|
+#ifndef __ANDROID__
|
|
|
|
|
// Glob - wrapper around "glob()" /*{{{*/
|
|
|
|
|
std::vector<std::string> Glob(std::string const &pattern, int flags)
|
|
|
|
|
{
|
2017-09-17 20:51:20 +02:00
|
|
|
@@ -2777,6 +2780,7 @@
|
2017-07-23 23:42:07 +02:00
|
|
|
globfree(&globbuf);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
+#endif
|
|
|
|
|
/*}}}*/
|
|
|
|
|
static std::string APT_NONNULL(1) GetTempDirEnv(char const * const env) /*{{{*/
|
|
|
|
|
{
|
|
|
|
|
diff -u -r ../apt-1.4.7/apt-pkg/contrib/fileutl.h ./apt-pkg/contrib/fileutl.h
|
|
|
|
|
--- ../apt-1.4.7/apt-pkg/contrib/fileutl.h 2017-07-13 23:45:39.000000000 +0200
|
2017-09-17 20:51:20 +02:00
|
|
|
+++ ./apt-pkg/contrib/fileutl.h 2017-08-26 22:05:52.875932441 +0200
|
2017-07-23 23:42:07 +02:00
|
|
|
@@ -239,7 +239,9 @@
|
|
|
|
|
APT_HIDDEN std::string flNormalize(std::string file);
|
|
|
|
|
|
|
|
|
|
// simple c++ glob
|
|
|
|
|
+#ifndef __ANDROID__
|
|
|
|
|
std::vector<std::string> Glob(std::string const &pattern, int flags=0);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
/** \brief Popen() implementation that execv() instead of using a shell
|
|
|
|
|
*
|
