Ticket #6746: bash-builtins.patch

src/bin/bash/builtins/mkbuiltins.c

@@ -19 +19 @@
    along with Bash.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined (CROSS_COMPILING) 
+#if !defined (CROSS_COMPILING)
 #  include <config.h>
 #else   /* CROSS_COMPILING */
 /* A conservative set of defines based on POSIX/SUS3/XPG6 */
@@ -221 +221 @@
 
       if (strcmp (arg, "-externfile") == 0)
     extern_filename = argv[arg_index++];
+      else if (strcmp (arg, "-tempstructfile") == 0)
+    temp_struct_filename = argv[arg_index++];
       else if (strcmp (arg, "-structfile") == 0)
     struct_filename = argv[arg_index++];
       else if (strcmp (arg, "-noproduction") == 0)
@@ -287 +289 @@
       /* Open the files. */
       if (struct_filename)
     {
-      temp_struct_filename = xmalloc (15);
-      sprintf (temp_struct_filename, "mk-%ld", (long) getpid ());
+      if (!temp_struct_filename)
+      {
+        temp_struct_filename = xmalloc (15);
+        sprintf (temp_struct_filename, "mk-%ld", (long) getpid ());
+      }
       structfile = fopen (temp_struct_filename, "w");
 
       if (!structfile)
@@ -1448 +1453 @@
     {
       if (filename_p == 0)
         {
-          if (line[0])        
+          if (line[0])
         fprintf (stream, "  N_(\"");
           else
         fprintf (stream, "  N_(\" ");       /* the empty string translates specially. */

src/bin/bash/builtins/Jamfile

@@ -47 +47 @@
 
 actions MkBuiltinsExt1
 {
-    $(2[1]) -externfile $(1[1]) -structfile $(1[2]) -noproduction $(2[2-]) ;
+    $(2[1]) -externfile $(1[1]) -tempstructfile $(1[2]).temp -structfile $(1[2]) -noproduction $(2[2-]) ;
 }
 
 local bashDefFiles =