Merge branch 'maint'

Conflicts:
	OTP_VERSION
	erts/vsn.mk

5 files changed, 111 insertions, 11 deletions

diff --git a/erts/etc/common/ct_run.c b/erts/etc/common/ct_run.c
index 11cec26264..548514ee6c 100644
--- a/erts/etc/common/ct_run.c
+++ b/erts/etc/common/ct_run.c
@@ -83,6 +83,7 @@ static int eargc;		/* Number of arguments in eargv. */
 static void error(char* format, ...);
 static char* emalloc(size_t size);
 static char* strsave(char* string);
+static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
 static char* get_default_emulator(char* progname);
 #ifdef __WIN32__
@@ -151,8 +152,6 @@ int main(int argc, char** argv)
     argv0 = argv;
 
     emulator = get_default_emulator(argv[0]);
-    if (strlen(emulator) >= MAXPATHLEN)
-	error("Emulator path length is too large");
 
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
@@ -164,7 +163,7 @@ int main(int argc, char** argv)
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
-    PUSH(strsave(emulator));
+    push_words(emulator);
     eargc_base = eargc;
     eargv = eargv + eargv_size/2;
     eargc = 0;
@@ -295,6 +294,26 @@ int main(int argc, char** argv)
     return run_erlang(eargv[0], eargv);
 }
 
+static void
+push_words(char* src)
+{
+    char sbuf[MAXPATHLEN];
+    char* dst;
+
+    dst = sbuf;
+    while ((*dst++ = *src++) != '\0') {
+	if (isspace((int)*src)) {
+	    *dst = '\0';
+	    PUSH(strsave(sbuf));
+	    dst = sbuf;
+	    do {
+		src++;
+	    } while (isspace((int)*src));
+	}
+    }
+    if (sbuf[0])
+	PUSH(strsave(sbuf));
+}
 #ifdef __WIN32__
 wchar_t *make_commandline(char **argv)
 {
diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c
index cac1464bf6..c45626606c 100644
--- a/erts/etc/common/dialyzer.c
+++ b/erts/etc/common/dialyzer.c
@@ -65,6 +65,7 @@ static int eargc;		/* Number of arguments in eargv. */
 static void error(char* format, ...);
 static char* emalloc(size_t size);
 static char* strsave(char* string);
+static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
 static char* get_default_emulator(char* progname);
 #ifdef __WIN32__
@@ -188,7 +189,7 @@ int main(int argc, char** argv)
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
-    PUSH(strsave(emulator));
+    push_words(emulator);
     eargc_base = eargc;
     eargv = eargv + eargv_size/2;
     eargc = 0;
@@ -268,6 +269,27 @@ int main(int argc, char** argv)
     return run_erlang(eargv[0], eargv);
 }
 
+static void
+push_words(char* src)
+{
+    char sbuf[MAXPATHLEN];
+    char* dst;
+
+    dst = sbuf;
+    while ((*dst++ = *src++) != '\0') {
+	if (isspace((int)*src)) {
+	    *dst = '\0';
+	    PUSH(strsave(sbuf));
+	    dst = sbuf;
+	    do {
+		src++;
+	    } while (isspace((int)*src));
+	}
+    }
+    if (sbuf[0])
+	PUSH(strsave(sbuf));
+}
+
 #ifdef __WIN32__
 wchar_t *make_commandline(char **argv)
 {
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index 049afc526a..f9d909e01c 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -200,7 +200,7 @@ int main(int argc, char** argv)
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
-    PUSH(strsave(emulator));
+    push_words(emulator);
     eargc_base = eargc;
     eargv = eargv + eargv_size/2;
     eargc = 0;
@@ -330,6 +330,26 @@ process_opt(int* pArgc, char*** pArgv, int offset)
     return argv[1];
 }
 
+static void
+push_words(char* src)
+{
+    char sbuf[MAXPATHLEN];
+    char* dst;
+
+    dst = sbuf;
+    while ((*dst++ = *src++) != '\0') {
+	if (isspace((int)*src)) {
+	    *dst = '\0';
+	    PUSH(strsave(sbuf));
+	    dst = sbuf;
+	    do {
+		src++;
+	    } while (isspace((int)*src));
+	}
+    }
+    if (sbuf[0])
+	PUSH(strsave(sbuf));
+}
 #ifdef __WIN32__
 wchar_t *make_commandline(char **argv)
 {
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index a5c6d0d40b..7fd02ed436 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -74,6 +74,7 @@ static void error(char* format, ...);
 static char* emalloc(size_t size);
 static void efree(void *p);
 static char* strsave(char* string);
+static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
 static char* get_default_emulator(char* progname);
 #ifdef __WIN32__
@@ -431,7 +432,7 @@ main(int argc, char** argv)
 	emulator = get_default_emulator(argv[0]);
     }
 
-    if (strlen(emulator) >= MAXPATHLEN)
+    if (strlen(emulator) >= PMAX)
         error("Value of environment variable ESCRIPT_EMULATOR is too large");
 
     /*
@@ -444,7 +445,7 @@ main(int argc, char** argv)
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
-    PUSH(strsave(emulator));
+    push_words(emulator);
     eargc_base = eargc;
     eargv = eargv + eargv_size/2;
     eargc = 0;
@@ -553,6 +554,26 @@ main(int argc, char** argv)
     return run_erlang(eargv[0], eargv);
 }
 
+static void
+push_words(char* src)
+{
+    char sbuf[PMAX];
+    char* dst;
+
+    dst = sbuf;
+    while ((*dst++ = *src++) != '\0') {
+	if (isspace((int)*src)) {
+	    *dst = '\0';
+	    PUSH(strsave(sbuf));
+	    dst = sbuf;
+	    do {
+		src++;
+	    } while (isspace((int)*src));
+	}
+    }
+    if (sbuf[0])
+	PUSH(strsave(sbuf));
+}
 #ifdef __WIN32__
 wchar_t *make_commandline(char **argv)
 {
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
index 7ff8aa76e2..0aa0996808 100644
--- a/erts/etc/common/typer.c
+++ b/erts/etc/common/typer.c
@@ -65,6 +65,7 @@ static int eargc;		/* Number of arguments in eargv. */
 static void error(char* format, ...);
 static char* emalloc(size_t size);
 static char* strsave(char* string);
+static void push_words(char* src);
 static int run_erlang(char* name, char** argv);
 static char* get_default_emulator(char* progname);
 #ifdef __WIN32__
@@ -128,9 +129,6 @@ main(int argc, char** argv)
 
     emulator = get_default_emulator(argv[0]);
 
-    if (strlen(emulator) >= MAXPATHLEN)
-	error("Emulator path length is too large");
-
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
@@ -141,7 +139,7 @@ main(int argc, char** argv)
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
-    PUSH(strsave(emulator));
+    push_words(emulator);
     eargc_base = eargc;
     eargv = eargv + eargv_size/2;
     eargc = 0;
@@ -194,6 +192,26 @@ main(int argc, char** argv)
     return run_erlang(eargv[0], eargv);
 }
 
+static void
+push_words(char* src)
+{
+    char sbuf[MAXPATHLEN];
+    char* dst;
+
+    dst = sbuf;
+    while ((*dst++ = *src++) != '\0') {
+	if (isspace((int)*src)) {
+	    *dst = '\0';
+	    PUSH(strsave(sbuf));
+	    dst = sbuf;
+	    do {
+		src++;
+	    } while (isspace((int)*src));
+	}
+    }
+    if (sbuf[0])
+	PUSH(strsave(sbuf));
+}
 #ifdef __WIN32__
 wchar_t *make_commandline(char **argv)
 {