diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2016-09-29 03:44:05 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2016-09-29 03:44:05 +0000 |
commit | e78331a9633a7ed466ae2d0bd2c29828eb112eae (patch) | |
tree | b96ac17f4ec6a977031d1dcf40e70ad8aecbcbd2 /devel/android-tools-adb-devel/files/patch-base_file.cpp | |
parent | games/aquaria: update to 1.002.22 (diff) |
devel/android-tools-{adb,fastboot}-devel: update to n.p.5.3582
Changes: https://android.googlesource.com/platform/system/core/+log/2f21b7cecda2..dfd30c4a169e/adb
Changes: https://android.googlesource.com/platform/system/core/+log/2f21b7cecda2..dfd30c4a169e/fastboot
Notes
Notes:
svn path=/head/; revision=422901
Diffstat (limited to 'devel/android-tools-adb-devel/files/patch-base_file.cpp')
-rw-r--r-- | devel/android-tools-adb-devel/files/patch-base_file.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/devel/android-tools-adb-devel/files/patch-base_file.cpp b/devel/android-tools-adb-devel/files/patch-base_file.cpp new file mode 100644 index 000000000000..199da0b95aca --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-base_file.cpp @@ -0,0 +1,40 @@ +--- base/file.cpp.orig 2016-09-28 18:07:09 UTC ++++ base/file.cpp +@@ -18,6 +18,9 @@ + + #include <errno.h> + #include <fcntl.h> ++#include <limits.h> // PATH_MAX ++#include <stdio.h> // BUFSIZ ++#include <string.h> // strerror + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +@@ -34,6 +37,9 @@ + #if defined(__APPLE__) + #include <mach-o/dyld.h> + #endif ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/sysctl.h> ++#endif + #if defined(_WIN32) + #include <windows.h> + #endif +@@ -231,6 +237,17 @@ std::string GetExecutablePath() { + if (result == 0 || result == sizeof(path) - 1) return ""; + path[PATH_MAX - 1] = 0; + return path; ++#elif defined(KERN_PROC_PATHNAME) ++ char path[PATH_MAX + 1]; ++ size_t path_len = sizeof(path); ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PATHNAME, ++ getpid() ++ }; ++ int rc = sysctl(mib, arraysize(mib), path, &path_len, NULL, 0); ++ return rc ? "" : path; + #else + #error unknown OS + #endif |