Changeset 535 for trunk/src/gmake/w32

Timestamp:

Sep 19, 2006, 6:29:18 AM (19 years ago)

Author:

bird

Message:

o A real attempt at fixing the double quoting problem on windows. ash seems to want a

space between a double quote enclosing the last argument on the commandline and the
double quote enclosing the commandline (the -c argument). Also, defined HAVE_CYGWIN_SHELL.

o Fixed a newline escape problem when using batch_mode_shell on windows with kmk_ash.

File:

• trunk/src/gmake/w32/subproc/sub_proc.c (modified) (3 diffs)

trunk/src/gmake/w32/subproc/sub_proc.c

@@ -1073 +1073 @@
          */
         bytes_required++;
+#ifdef KMK /* for the space before the final " in case we need it. */
+        bytes_required++;
+#endif 
 
         command_line = (char*) malloc(bytes_required);
@@ -1117 +1120 @@
                                 } else {
 
-                                /*
-                                 * We have to insert a backslash for the "
-                                 * and each \ that precedes the ".
-                                 */
-                                backslash_count++;
-
-                                while(backslash_count) {
-                                        *(command_line_i++) = '\\';
-                                        backslash_count--;
-                                };
+                                        /*
+                                         * We have to insert a backslash for the "
+                                         * and each \ that precedes the ".
+                                         */
+                                        backslash_count++;
+        
+                                        while(backslash_count) {
+                                                *(command_line_i++) = '\\';
+                                                backslash_count--;
+                                        };
                                 }
 #if !defined(HAVE_MKS_SHELL) && !defined(HAVE_CYGWIN_SHELL)
@@ -1152 +1155 @@
                         };
 #endif
+#ifdef KMK
+                        /* 
+                         * ash it put off by echo "hello world" ending up as:
+                         *  G:/.../kmk_ash.exe -c "echo ""hello world"""
+                         * It wants a space before the last '"'.
+                         * (The 'test_shell' goals in Makefile.kmk tests this problem.)
+                         */
+                        if (command_line_i[-1] == '\"' && cygwin_mode && have_sh && !argvi[1]) {
+                            *(command_line_i++) = ' ';
+                        }
+#endif 
                         *(command_line_i++) = '\"';
                 }