You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
1.8 KiB
51 lines
1.8 KiB
9 years ago
|
diff -u -r ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/env_universal_common.cpp ./src/env_universal_common.cpp
|
||
|
|
--- ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/env_universal_common.cpp 2016-05-03 01:20:53.000000000 -0400
|
||
|
|
+++ ./src/env_universal_common.cpp 2016-05-03 06:59:06.896497467 -0400
|
||
|
|
@@ -134,7 +134,7 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
// /tmp/fish.user
|
||
|
|
- std::string tmpdir = "/tmp/fish.";
|
||
|
|
+ std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish.";
|
||
|
|
tmpdir.append(uname);
|
||
|
|
if (check_runtime_path(tmpdir.c_str()) != 0) {
|
||
|
|
debug(0,
|
||
|
|
@@ -985,6 +985,7 @@
|
||
|
|
return result;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
class universal_notifier_shmem_poller_t : public universal_notifier_t {
|
||
|
|
// This is what our shared memory looks like. Everything here is stored in network byte order
|
||
|
|
// (big-endian).
|
||
|
|
@@ -1126,6 +1127,7 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
};
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
/// A notifyd-based notifier. Very straightforward.
|
||
|
|
class universal_notifier_notifyd_t : public universal_notifier_t {
|
||
|
|
@@ -1409,7 +1412,9 @@
|
||
|
|
const char *name;
|
||
|
|
universal_notifier_t::notifier_strategy_t strat;
|
||
|
|
} options[] = {{"default", universal_notifier_t::strategy_default},
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
{"shmem", universal_notifier_t::strategy_shmem_polling},
|
||
|
|
+#endif
|
||
|
|
{"pipe", universal_notifier_t::strategy_named_pipe},
|
||
|
|
{"notifyd", universal_notifier_t::strategy_notifyd}};
|
||
|
|
const size_t opt_count = sizeof options / sizeof *options;
|
||
|
|
@@ -1462,9 +1467,11 @@
|
||
|
|
strat = resolve_default_strategy();
|
||
|
|
}
|
||
|
|
switch (strat) {
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
case strategy_shmem_polling: {
|
||
|
|
return new universal_notifier_shmem_poller_t();
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
case strategy_notifyd: {
|
||
|
|
return new universal_notifier_notifyd_t();
|
||
|
|
}
|