From 89de07a9442072f88d49869d8ecd8d42bae050a0 Mon Sep 17 00:00:00 2001

From: Jouni Malinen <jouni@qca.qualcomm.com>

Date: Mon, 6 Oct 2014 16:27:44 +0300

Subject: [PATCH 1/3] Add os_exec() helper to run external programs

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

---

 src/utils/os.h       |  9 +++++++++

 src/utils/os_unix.c  | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++

 src/utils/os_win32.c |  6 ++++++

 3 files changed, 70 insertions(+)

diff -up hostapd-2.0/src/utils/os.h.helper hostapd-2.0/src/utils/os.h

--- hostapd-2.0/src/utils/os.h.helper	2013-01-12 10:42:53.000000000 -0500

+++ hostapd-2.0/src/utils/os.h	2014-10-23 16:04:33.241498961 -0400

@@ -506,6 +506,15 @@ static inline void * os_realloc_array(vo

  */

 size_t os_strlcpy(char *dest, const char *src, size_t siz);

+/**

+ * os_exec - Execute an external program

+ * @program: Path to the program

+ * @arg: Command line argument string

+ * @wait_completion: Whether to wait until the program execution completes

+ * Returns: 0 on success, -1 on error

+ */

+int os_exec(const char *program, const char *arg, int wait_completion);

+

 #ifdef OS_REJECT_C_LIB_FUNCTIONS

 #define malloc OS_DO_NOT_USE_malloc

diff -up hostapd-2.0/src/utils/os_unix.c.helper hostapd-2.0/src/utils/os_unix.c

--- hostapd-2.0/src/utils/os_unix.c.helper	2013-01-12 10:42:53.000000000 -0500

+++ hostapd-2.0/src/utils/os_unix.c	2014-10-23 16:04:33.242498969 -0400

@@ -9,6 +9,7 @@

 #include "includes.h"

 #include <time.h>

+#include <sys/wait.h>

 #ifdef ANDROID

 #include <linux/capability.h>

@@ -486,3 +487,57 @@ char * os_strdup(const char *s)

 }

 #endif /* WPA_TRACE */

+

+

+int os_exec(const char *program, const char *arg, int wait_completion)

+{

+	pid_t pid;

+	int pid_status;

+

+	pid = fork();

+	if (pid < 0) {

+		perror("fork");

+		return -1;

+	}

+

+	if (pid == 0) {

+		/* run the external command in the child process */

+		const int MAX_ARG = 30;

+		char *_program, *_arg, *pos;

+		char *argv[MAX_ARG + 1];

+		int i;

+

+		_program = os_strdup(program);

+		_arg = os_strdup(arg);

+

+		argv[0] = _program;

+

+		i = 1;

+		pos = _arg;

+		while (i < MAX_ARG && pos && *pos) {

+			while (*pos == ' ')

+				pos++;

+			if (*pos == '\0')

+				break;

+			argv[i++] = pos;

+			pos = os_strchr(pos, ' ');

+			if (pos)

+				*pos++ = '\0';

+		}

+		argv[i] = NULL;

+

+		execv(program, argv);

+		perror("execv");

+		os_free(_program);

+		os_free(_arg);

+		exit(0);

+		return -1;

+	}

+

+	if (wait_completion) {

+		/* wait for the child process to complete in the parent */

+		waitpid(pid, &pid_status, 0);

+	}

+

+	return 0;

+}

diff -up hostapd-2.0/src/utils/os_win32.c.helper hostapd-2.0/src/utils/os_win32.c

--- hostapd-2.0/src/utils/os_win32.c.helper	2013-01-12 10:42:53.000000000 -0500

+++ hostapd-2.0/src/utils/os_win32.c	2014-10-23 16:04:33.242498969 -0400

@@ -233,3 +233,9 @@ size_t os_strlcpy(char *dest, const char

 	return s - src - 1;

 }

+

+

+int os_exec(const char *program, const char *arg, int wait_completion)

+{

+	return -1;

+}