|
|
@ -1,7 +1,17 @@ |
|
|
|
diff -u -r ../apt-1.1.3/apt-pkg/contrib/fileutl.cc ./apt-pkg/contrib/fileutl.cc
|
|
|
|
--- ../apt-1.1.3/apt-pkg/contrib/fileutl.cc 2015-11-30 03:08:24.000000000 -0500
|
|
|
|
+++ ./apt-pkg/contrib/fileutl.cc 2015-12-03 17:43:23.360831115 -0500
|
|
|
|
@@ -100,7 +100,7 @@
|
|
|
|
+++ ./apt-pkg/contrib/fileutl.cc 2015-12-04 07:11:09.531546721 -0500
|
|
|
|
@@ -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> |
|
|
|
|
|
|
|
@@ -100,7 +102,7 @@
|
|
|
|
_exit(100); |
|
|
|
} |
|
|
|
|
|
|
@ -10,7 +20,7 @@ diff -u -r ../apt-1.1.3/apt-pkg/contrib/fileutl.cc ./apt-pkg/contrib/fileutl.cc |
|
|
|
_exit(100); |
|
|
|
|
|
|
|
unsigned int Count = 1; |
|
|
|
@@ -2102,6 +2102,7 @@
|
|
|
|
@@ -2102,6 +2104,7 @@
|
|
|
|
std::vector<std::string> Glob(std::string const &pattern, int flags) |
|
|
|
{ |
|
|
|
std::vector<std::string> result; |
|
|
@ -18,7 +28,7 @@ diff -u -r ../apt-1.1.3/apt-pkg/contrib/fileutl.cc ./apt-pkg/contrib/fileutl.cc |
|
|
|
glob_t globbuf; |
|
|
|
int glob_res; |
|
|
|
unsigned int i; |
|
|
|
@@ -2121,6 +2122,7 @@
|
|
|
|
@@ -2121,6 +2124,7 @@
|
|
|
|
result.push_back(string(globbuf.gl_pathv[i])); |
|
|
|
|
|
|
|
globfree(&globbuf); |
|
|
@ -26,7 +36,7 @@ diff -u -r ../apt-1.1.3/apt-pkg/contrib/fileutl.cc ./apt-pkg/contrib/fileutl.cc |
|
|
|
return result; |
|
|
|
} |
|
|
|
/*}}}*/ |
|
|
|
@@ -2136,10 +2138,10 @@
|
|
|
|
@@ -2136,10 +2140,10 @@
|
|
|
|
struct stat st; |
|
|
|
if (!tmpdir || strlen(tmpdir) == 0 || // tmpdir is set |
|
|
|
stat(tmpdir, &st) != 0 || (st.st_mode & S_IFDIR) == 0) // exists and is directory |
|
|
|