(output_skeleton): Use end_of_output_subpipe() to handle

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 3839412e885808dcf86d5874d61f3b34a1a65fee..24a77a8ce1903e4e9987e934928ccaac91d9b536 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -577,6 +577,7 @@ output_skeleton (void)
 
   /* Read and process m4's output.  */
   timevar_push (TV_M4);
+  end_of_output_subpipe (pid, filter_fd);
   in = fdopen (filter_fd[1], "r");
   if (! in)
     error (EXIT_FAILURE, get_errno (),
@@ -618,8 +619,8 @@ prepare (void)
 
   /* About the skeletons. */
   {
-    char const* p = getenv ("BISON_PKGDATADIR");
-    MUSCLE_INSERT_STRING ("pkgdatadir", p ? p : PKGDATADIR);
+    char const *pkgdatadir = getenv ("BISON_PKGDATADIR");
+    MUSCLE_INSERT_STRING ("pkgdatadir", pkgdatadir ? pkgdatadir : PKGDATADIR);
     MUSCLE_INSERT_C_STRING ("skeleton", skeleton);
   }
 }