diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-06-22 12:43:00 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-06-22 12:43:00 +0000 |
| commit | 228dd6ce73b0291a1100508203ea5f07478e4617 (patch) | |
| tree | be02500acba61cd6b1b9d7ab1f9abc8f5fc5c174 /devel/android-tools-fastboot-devel/files/patch-base_file.cpp | |
| parent | Upgrade argdata and cloudabi-utils to the latest upstream versions. (diff) | |
devel/android-tools-fastboot-devel: update to o.p.2.332
Changes: https://android.googlesource.com/platform/system/core/+log/dfd30c4a169e..d1e9e7bc06f0/fastboot
Notes
Notes:
svn path=/head/; revision=444112
Diffstat (limited to 'devel/android-tools-fastboot-devel/files/patch-base_file.cpp')
| -rw-r--r-- | devel/android-tools-fastboot-devel/files/patch-base_file.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp index 199da0b95aca..a0406b97b605 100644 --- a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp +++ b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp @@ -1,16 +1,17 @@ ---- base/file.cpp.orig 2016-09-28 18:07:09 UTC +--- base/file.cpp.orig 2017-06-20 10:50:27 UTC +++ base/file.cpp -@@ -18,6 +18,9 @@ - +@@ -19,6 +19,10 @@ #include <errno.h> #include <fcntl.h> + #include <libgen.h> +#include <limits.h> // PATH_MAX +#include <stdio.h> // BUFSIZ ++#include <stdlib.h> // realpath +#include <string.h> // strerror #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -34,6 +37,9 @@ +@@ -36,6 +39,9 @@ #if defined(__APPLE__) #include <mach-o/dyld.h> #endif @@ -19,8 +20,8 @@ +#endif #if defined(_WIN32) #include <windows.h> - #endif -@@ -231,6 +237,17 @@ std::string GetExecutablePath() { + #define O_CLOEXEC O_NOINHERIT +@@ -251,6 +257,17 @@ std::string GetExecutablePath() { if (result == 0 || result == sizeof(path) - 1) return ""; path[PATH_MAX - 1] = 0; return path; |