From 212056367b28056afc7702fbe11fef0d918cf928 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 22 Aug 2017 13:01:20 +0000
Subject: devel/android-tools-{adb,fastboot}: update to 8.0.0.r4 (oreo)

Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.1.2_r17..android-8.0.0_r4/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.1.2_r17..android-8.0.0_r4/fastboot
---
 .../files/patch-base_file.cpp                      | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 devel/android-tools-fastboot/files/patch-base_file.cpp

(limited to 'devel/android-tools-fastboot/files/patch-base_file.cpp')

diff --git a/devel/android-tools-fastboot/files/patch-base_file.cpp b/devel/android-tools-fastboot/files/patch-base_file.cpp
new file mode 100644
index 000000000000..ca20501150a6
--- /dev/null
+++ b/devel/android-tools-fastboot/files/patch-base_file.cpp
@@ -0,0 +1,47 @@
+--- base/file.cpp.orig	2017-06-20 10:50:27 UTC
++++ base/file.cpp
+@@ -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>
+@@ -36,6 +39,9 @@
+ #if defined(__APPLE__)
+ #include <mach-o/dyld.h>
+ #endif
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
++#include <sys/sysctl.h>
++#endif
+ #if defined(_WIN32)
+ #include <windows.h>
+ #define O_CLOEXEC O_NOINHERIT
+@@ -251,6 +258,23 @@ 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,
++#if defined(__NetBSD__)
++    KERN_PROC_ARGS,
++    -1,
++    KERN_PROC_PATHNAME,
++#else
++    KERN_PROC,
++    KERN_PROC_PATHNAME,
++    -1,
++#endif
++  };
++  int rc = sysctl(mib, arraysize(mib), path, &path_len, NULL, 0);
++  return rc ? "" : path;
+ #else
+ #error unknown OS
+ #endif
-- 
cgit v1.2.3