Merge maint-5.004 branch (5.004_04) with mainline.

p4raw-id: //depot/perl@137

1 files changed, 5 insertions, 1 deletions

diff --git a/os2/os2.c b/os2/os2.c
index 80742429be..8a292e30f2 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -294,7 +294,7 @@ int execf;
     register char *s;
     char flags[10];
     char *shell, *copt, *news = NULL;
-    int rc, added_shell = 0, err;
+    int rc, added_shell = 0, err, seenspace = 0;
     char fullcmd[MAXNAMLEN + 1];
 
 #ifdef TRYSHELL
@@ -346,6 +346,8 @@ int execf;
 	    if (*s == '\n' && s[1] == '\0') {
 		*s = '\0';
 		break;
+	    } else if (*s == '\\' && !seenspace) {
+		continue;		/* Allow backslashes in names */
 	    }
 	  doshell:
 	    if (execf == EXECF_TRUEEXEC)
@@ -364,6 +366,8 @@ int execf;
 	    if (rc < 0) rc = 255 << 8; /* Emulate the fork(). */
 	    if (news) Safefree(news);
 	    return rc;
+	} else if (*s == ' ' || *s == '\t') {
+	    seenspace = 1;
 	}
     }