win32: Fix quoting of paths

2 files changed, 60 insertions, 60 deletions

diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 0ded6b274e..ae44c8424f 100755
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -1392,39 +1392,46 @@ int parse_command(wchar_t* cmd){
     return i;
 }
 
-static BOOL need_quotes(wchar_t *str)
-{
-    int in_quote = 0;
-    int backslashed = 0;
-    int naked_space = 0;
 
-    while (*str != L'\0') {
-	switch (*str) {
-	case L'\\' :
-	    backslashed = !backslashed;
-	    break;
-	case L'"':
-	    if (backslashed) {
-		backslashed=0;
-	    } else {
-		in_quote = !in_quote;
-	    }
-	    break;
-	case L' ':
-	    backslashed = 0;
-	    if (!(backslashed || in_quote)) {
-		naked_space++;
-	    }
-	    break;
-	default:
-	    backslashed = 0;
+/*
+ * Translating of command line arguments to correct format. In the examples
+ * below the '' are not part of the actual string. 
+ * 'io:format("hello").' -> 'io:format(\"hello\").'
+ * 'io:format("is anybody in there?").' -> '"io:format(\"is anybody in there?\")."'
+ * 'Just nod if you can hear me.' -> '"Just nod if you can hear me."'
+ * 'Is there ""anyone at home?' -> '"Is there \"\"anyone at home?"'
+ * 'Relax."' -> 'Relax.\"'
+ *
+ * If new == NULL we just calculate the length.
+ *
+ * The reason for having to quote all of the is becasue CreateProcessW removes
+ * one level of escaping since it takes a single long command line rather
+ * than the argument chunks that unix uses.
+ */
+static int escape_and_quote(wchar_t *str, wchar_t *new, BOOL *quoted) {
+    int i, j = 0;
+    if (new == NULL)
+        *quoted = FALSE;
+    else if (*quoted)
+        new[j++] = L'"';
+    for ( i = 0; str[i] != L'\0'; i++,j++) {
+        if (str[i] == L' ' && new == NULL && *quoted == FALSE) {
+	    *quoted = TRUE;
+	    j++;
+	}
+	/* check if we have to escape quotes */
+	if (str[i] == L'"') {
+	    if (new) new[j] = L'\\';
+	    j++;
 	}
-	++str;
+	if (new) new[j] = str[i];
     }
-    return (naked_space > 0);
+    if (*quoted) {
+        if (new) new[j] = L'"';
+	j++;
+    }
+    return j;
 }
-	    
-	    
 
 /*
  *----------------------------------------------------------------------
@@ -1585,31 +1592,24 @@ create_child_process
 	    wcscpy(appname, execPath);
 	}
 	if (argv == NULL) { 
-	    BOOL orig_need_q = need_quotes(execPath);
+	    BOOL orig_need_q;
 	    wchar_t *ptr;
-	    int ocl = wcslen(execPath);
+	    int ocl = escape_and_quote(execPath, NULL, &orig_need_q);
 	    if (run_cmd) {
 		newcmdline = (wchar_t *) erts_alloc(ERTS_ALC_T_TMP,
-						    (ocl + ((orig_need_q) ? 3 : 1)
-						     + 11)*sizeof(wchar_t));
+						    (ocl + 1 + 11)*sizeof(wchar_t));
 		memcpy(newcmdline,L"cmd.exe /c ",11*sizeof(wchar_t));
 		ptr = newcmdline + 11;
 	    } else {
 		newcmdline = (wchar_t *) erts_alloc(ERTS_ALC_T_TMP,
-						    (ocl + ((orig_need_q) ? 3 : 1))*sizeof(wchar_t));
+						    (ocl + 1)*sizeof(wchar_t));
 		ptr = (wchar_t *) newcmdline;
 	    }
-	    if (orig_need_q) {
-		*ptr++ = L'"';
-	    }
-	    memcpy(ptr,execPath,ocl*sizeof(wchar_t));
-	    ptr += ocl;
-	    if (orig_need_q) {
-		*ptr++ = L'"';
-	    }
-	    *ptr = L'\0';
+	    ptr += escape_and_quote(execPath, ptr, &orig_need_q);
+	    ptr[0] = L'\0';
 	} else {
-	    int sum = 1; /* '\0' */
+	    int sum = 0;
+	    BOOL *qte = NULL;
 	    wchar_t **ar = argv;
 	    wchar_t *n;
 	    wchar_t *save_arg0 = NULL;
@@ -1620,11 +1620,13 @@ create_child_process
 	    if (run_cmd) {
 		sum += 11; /* cmd.exe /c */
 	    }
+
+	    while (*ar != NULL)  ar++;
+	    qte = erts_alloc(ERTS_ALC_T_TMP, (ar - argv)*sizeof(BOOL));
+
+	    ar = argv;
 	    while (*ar != NULL) {
-		sum += wcslen(*ar);
-		if (need_quotes(*ar)) {
-		    sum += 2; /* quotes */
-		}
+		sum += escape_and_quote(*ar,NULL,qte+(ar - argv));
 		sum++; /* space */
 		++ar;
 	    }
@@ -1636,26 +1638,18 @@ create_child_process
 		n += 11;
 	    }
 	    while (*ar != NULL) {
-		int q = need_quotes(*ar);
-		sum = wcslen(*ar);
-		if (q) {
-		    *n++ = L'"';
-		}
-		memcpy(n,*ar,sum*sizeof(wchar_t));
-		n += sum;
-		if (q) {
-		    *n++ = L'"';
-		}
+		n += escape_and_quote(*ar,n,qte+(ar - argv));
 		*n++ = L' ';
 		++ar;
 	    }
-	    *(n-1) = L'\0';
+	    *(n-1) = L'\0'; /* overwrite last space with '\0' */
 	    if (save_arg0 != NULL) {
 		argv[0] = save_arg0;
 	    }
+	    erts_free(ERTS_ALC_T_TMP, qte);
 	}	    
 	    
-	DEBUGF(("Creating child process: %s, createFlags = %d\n", newcmdline, createFlags));
+	DEBUGF((stderr,"Creating child process: %S, createFlags = %d\n", newcmdline, createFlags));
 	ok = CreateProcessW((wchar_t *) appname,
 			    (wchar_t *) newcmdline,
 			    NULL,
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index e01b2f253b..738d60b8a4 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -1405,6 +1405,12 @@ spawn_executable(Config) when is_list(Config) ->
 	run_echo_args(SpaceDir,[ExactFile2,"hello world","dlrow olleh"]),
     [ExactFile2,"hello world","dlrow olleh"] =
 	run_echo_args(SpaceDir,[binary, ExactFile2,"hello world","dlrow olleh"]),
+
+    [ExactFile2,"hello \"world\"","\"dlrow\" olleh"] =
+	run_echo_args(SpaceDir,[binary, ExactFile2,"hello \"world\"","\"dlrow\" olleh"]),
+    [ExactFile2,"hello \"world\"","\"dlrow\" olleh"] =
+	run_echo_args(SpaceDir,[binary, ExactFile2,"hello \"world\"","\"dlrow\" olleh"]),
+
     [ExactFile2] = run_echo_args(SpaceDir,[default]),
     [ExactFile2,"hello world","dlrow olleh"] = 
 	run_echo_args(SpaceDir,[switch_order,ExactFile2,"hello world",