maint: xfdopen, and scope reduction.

* src/files.h, src/files.c (xfdopen): New.
* src/output.c (output_skeleton): Use it.
Reduce the scope of argv.

diff --git a/src/files.c b/src/files.c
index b7000cfa6e05b38626ac9345d745c54471b5ff07..91c0c10ed29887a3e3d2ae31d6e5e225eaa5fdb4 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -134,6 +134,15 @@ xfclose (FILE *ptr)
 }
 \f
 
 }
 \f
 

+FILE *
+xfdopen (int fd, char const *mode)
+{
+  FILE *res = fdopen (fd, mode);
+  if (! res)
+    error (EXIT_FAILURE, get_errno (), "fdopen");
+  return res;
+}
+

 /*------------------------------------------------------------------.
 | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. |
 `------------------------------------------------------------------*/
 /*------------------------------------------------------------------.
 | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. |
 `------------------------------------------------------------------*/

diff --git a/src/files.h b/src/files.h
index 8f0bec04ac7e403bb2d9ab88f4ac960f64675216..e727d111c20450f8a2e335dab3299dacf9801e2f 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -65,7 +65,8 @@ void compute_output_file_names (void);
 void output_file_names_free (void);
 void output_file_name_check (char **file_name);
 
 void output_file_names_free (void);
 void output_file_name_check (char **file_name);
 

-FILE *xfopen (const char *name, const char *mode);
+FILE *xfopen (const char *name, char const *mode);

 void xfclose (FILE *ptr);
 void xfclose (FILE *ptr);

+FILE *xfdopen (int fd, char const *mode);

 
 #endif /* !FILES_H_ */
 
 #endif /* !FILES_H_ */

diff --git a/src/output.c b/src/output.c
index 37b15cfb7840c3e7cb88a857c3ffbf0277d46d68..76895d661471269e81fe757ffa4b10282b8c06f5 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -571,7 +571,6 @@ static void
 output_skeleton (void)
 {
   int filter_fd[2];
 output_skeleton (void)
 {
   int filter_fd[2];

-  char const *argv[10];

   pid_t pid;
 
   /* Compute the names of the package data dir and skeleton files.  */
   pid_t pid;
 
   /* Compute the names of the package data dir and skeleton files.  */


@@ -602,6 +601,7 @@ output_skeleton (void)
      <http://lists.gnu.org/archive/html/bug-bison/2008-07/msg00000.html>
      for details.  */
   {
      <http://lists.gnu.org/archive/html/bug-bison/2008-07/msg00000.html>
      for details.  */
   {

+    char const *argv[10];

     int i = 0;
     argv[i++] = m4;
 
     int i = 0;
     argv[i++] = m4;
 


@@ -627,11 +627,12 @@ output_skeleton (void)
     argv[i++] = skel;
     argv[i++] = NULL;
     aver (i <= ARRAY_CARDINALITY (argv));
     argv[i++] = skel;
     argv[i++] = NULL;
     aver (i <= ARRAY_CARDINALITY (argv));

+
+    /* The ugly cast is because gnulib gets the const-ness wrong.  */
+    pid = create_pipe_bidi ("m4", m4, (char **)(void*)argv, false, true,
+                            true, filter_fd);

   }
 
   }
 

-  /* The ugly cast is because gnulib gets the const-ness wrong.  */
-  pid = create_pipe_bidi ("m4", m4, (char **)(void*)argv, false, true,
-                          true, filter_fd);

   free (m4sugar);
   free (m4bison);
   free (skel);
   free (m4sugar);
   free (m4bison);
   free (skel);


@@ -639,10 +640,7 @@ output_skeleton (void)
   if (trace_flag & trace_muscles)
     muscles_output (stderr);
   {
   if (trace_flag & trace_muscles)
     muscles_output (stderr);
   {

-    FILE *out = fdopen (filter_fd[1], "w");
-    if (! out)
-      error (EXIT_FAILURE, get_errno (),
-             "fdopen");
+    FILE *out = xfdopen (filter_fd[1], "w");

     muscles_output (out);
     xfclose (out);
   }
     muscles_output (out);
     xfclose (out);
   }


@@ -650,10 +648,7 @@ output_skeleton (void)
   /* Read and process m4's output.  */
   timevar_push (TV_M4);
   {
   /* Read and process m4's output.  */
   timevar_push (TV_M4);
   {

-    FILE *in = fdopen (filter_fd[0], "r");
-    if (! in)
-      error (EXIT_FAILURE, get_errno (),
-            "fdopen");
+    FILE *in = xfdopen (filter_fd[0], "r");

     scan_skel (in);
     /* scan_skel should have read all of M4's output.  Otherwise, when we
        close the pipe, we risk letting M4 report a broken-pipe to the
     scan_skel (in);
     /* scan_skel should have read all of M4's output.  Otherwise, when we
        close the pipe, we risk letting M4 report a broken-pipe to the