Changeset 535 for trunk/src

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.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (2 diffs)
• job.c (modified) (2 diffs)
• main.c (modified) (1 diff)
• w32/subproc/sub_proc.c (modified) (3 diffs)

trunk/src/gmake/Makefile.kmk

@@ -30 +30 @@
         CONFIG_WITH_VALUE_LENGTH \
         CONFIG_WITH_COMPARE
+kmk_DEFS.win32 = HAVE_CYGWIN_SHELL
+kmk_DEFS.win64 = HAVE_CYGWIN_SHELL
 
 kmk_SOURCES = \
@@ -272 +274 @@
         echo "4"
 
-# shell double and single quoting check.
+
+#
+# Shell execution tests.
+#
+test_shell: test_shell_quoting test_shell_newline
+
+# shell double and single quoting check (was busted on windows in 3.81).
 test_shell_quoting:
+        $(ECHO_EXT) "double quoted sTrInG"
         $(ECHO_EXT) "double quoted sTrInG" | $(SED_EXT) -e "s/sTrInG/string/g"
         $(ECHO_EXT) 'single quoted sTrInG' | $(SED_EXT) -e 's/sTrInG/string/g'
         $(ECHO) "This string should not be printed with double quotes."
         $(ECHO) 'This string should not be printed with single quotes.'
+
+# when using batch mode shell, the newline got escaped twice and spoiling everything.
+test_shell_newline:
+        $(ECHO_EXT) "foo foo foo" | $(SED_EXT) -e \
+                's/foo/$@/' -e \
+                's/foo/works/' \
+                -e 's/foo/\!/'
+

trunk/src/gmake/job.c

@@ -2549 +2549 @@
 # ifndef KMK
     goto slow;
-#else /* KMK */
+# else /* KMK */
     {
       /* Allow ash from kBuild. */
@@ -2904 +2904 @@
               {
                 *(ap++) = '\\';
+#ifdef KMK /* see test in Makefile.kmk, required on windows. */
+                if (!batch_mode_shell)
+#endif 
                 *(ap++) = '\\';
                 *(ap++) = '\n';

trunk/src/gmake/main.c

@@ -893 +893 @@
   }
 
-#ifdef KMK
+#if 0/* def KMK - has been fixed in sub_proc.c */
   /* WORKAROUND:
     With GNU Make 3.81, this kludge was necessary to get double quotes

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++) = '\"';
                 }