Index: src/bin/bash/builtins/mkbuiltins.c
===================================================================
--- src/bin/bash/builtins/mkbuiltins.c (revision 39067)
+++ src/bin/bash/builtins/mkbuiltins.c (working copy)
@@ -19,7 +19,7 @@
along with Bash. If not, see .
*/
-#if !defined (CROSS_COMPILING)
+#if !defined (CROSS_COMPILING)
# include
#else /* CROSS_COMPILING */
/* A conservative set of defines based on POSIX/SUS3/XPG6 */
@@ -221,6 +221,8 @@
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,8 +289,11 @@
/* 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,7 +1453,7 @@
{
if (filename_p == 0)
{
- if (line[0])
+ if (line[0])
fprintf (stream, " N_(\"");
else
fprintf (stream, " N_(\" "); /* the empty string translates specially. */
Index: src/bin/bash/builtins/Jamfile
===================================================================
--- src/bin/bash/builtins/Jamfile (revision 39067)
+++ src/bin/bash/builtins/Jamfile (working copy)
@@ -47,7 +47,7 @@
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 =