diff mbox

wpa_cli: Use .wpa_cli_history under Android

Message ID 1426679478-32519-1-git-send-email-mikael.kanstrup@sonymobile.com
State Accepted
Headers show

Commit Message

Mikael Kanstrup March 18, 2015, 11:51 a.m. UTC 
wpa_cli already implements a command history file for easy accessing
commands previously used. Enable the functonality on Android too.

Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
---
 wpa_supplicant/Android.mk | 3 +++
 wpa_supplicant/wpa_cli.c  | 4 ++++
 2 files changed, 7 insertions(+)

Comments

Jouni Malinen March 26, 2015, 9:17 p.m. UTC | #1 
On Wed, Mar 18, 2015 at 12:51:18PM +0100, Mikael Kanstrup wrote:
> wpa_cli already implements a command history file for easy accessing
> commands previously used. Enable the functonality on Android too.

Thanks, applied.
diff mbox

Patch

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 6d39613..8222c0f 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -40,6 +40,9 @@  endif
 L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\"
 L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/wpa_supplicant\"
 
+# Use Android specific directory for wpa_cli command completion history
+L_CFLAGS += -DCONFIG_WPA_CLI_HISTORY_DIR=\"/data/misc/wifi\"
+
 # To force sizeof(enum) = 4
 ifeq ($(TARGET_ARCH),arm)
 L_CFLAGS += -mabi=aapcs-linux
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 2b40bbf..2f9ab03 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -3781,7 +3781,11 @@  static void start_edit(void)
 	ps = wpa_ctrl_get_remote_ifname(ctrl_conn);
 #endif /* CONFIG_CTRL_IFACE_UDP_REMOTE */
 
+#ifndef CONFIG_WPA_CLI_HISTORY_DIR
 	home = getenv("HOME");
+#else
+	home = CONFIG_WPA_CLI_HISTORY_DIR;
+#endif /* CONFIG_WPA_CLI_HISTORY_DIR */
 	if (home) {
 		const char *fname = ".wpa_cli_history";
 		int hfile_len = os_strlen(home) + 1 + os_strlen(fname) + 1;