Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 08:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(output_skeleton): Rename local var.

Browse Source
This commit is contained in:
Paul Eggert
2003-12-24 07:55:25 +00:00
parent 28f57d2ae3
commit eecf08fe94
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/output.c
View File

@@ -518,7 +518,7 @@ output_skeleton (void)
char const m4sugar[] = "m4sugar/m4sugar.m4"; char const m4sugar[] = "m4sugar/m4sugar.m4";
char *full_m4sugar; char *full_m4sugar;
char *full_cm4; char *full_cm4;
char *full_path; char *full_skeleton;
char const *p; char const *p;
char const *m4 = (p = getenv ("M4")) ? p : M4; char const *m4 = (p = getenv ("M4")) ? p : M4;
char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR; char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR;
@@ -526,36 +526,36 @@ output_skeleton (void)
size_t pkgdatadirlen = strlen (pkgdatadir); size_t pkgdatadirlen = strlen (pkgdatadir);
while (pkgdatadirlen && pkgdatadir[pkgdatadirlen - 1] == '/') while (pkgdatadirlen && pkgdatadir[pkgdatadirlen - 1] == '/')
pkgdatadirlen--; pkgdatadirlen--;
full_path = xmalloc (pkgdatadirlen + 1 full_skeleton = xmalloc (pkgdatadirlen + 1
+ (skeleton_size < sizeof m4sugar + (skeleton_size < sizeof m4sugar
? sizeof m4sugar : skeleton_size)); ? sizeof m4sugar : skeleton_size));
strcpy (full_path, pkgdatadir); strcpy (full_skeleton, pkgdatadir);
full_path[pkgdatadirlen] = '/'; full_skeleton[pkgdatadirlen] = '/';
strcpy (full_path + pkgdatadirlen + 1, m4sugar); strcpy (full_skeleton + pkgdatadirlen + 1, m4sugar);
full_m4sugar = xstrdup (full_path); full_m4sugar = xstrdup (full_skeleton);
strcpy (full_path + pkgdatadirlen + 1, "c.m4"); strcpy (full_skeleton + pkgdatadirlen + 1, "c.m4");
full_cm4 = xstrdup (full_path); full_cm4 = xstrdup (full_skeleton);
strcpy (full_path + pkgdatadirlen + 1, skeleton); strcpy (full_skeleton + pkgdatadirlen + 1, skeleton);
xfclose (xfopen (full_m4sugar, "r")); xfclose (xfopen (full_m4sugar, "r"));
/* Create an m4 subprocess connected to us via two pipes. */ /* Create an m4 subprocess connected to us via two pipes. */
if (trace_flag & trace_tools) if (trace_flag & trace_tools)
fprintf (stderr, "running: %s %s - %s %s\n", fprintf (stderr, "running: %s %s - %s %s\n",
m4, full_m4sugar, full_cm4, full_path); m4, full_m4sugar, full_cm4, full_skeleton);
argv[0] = m4; argv[0] = m4;
argv[1] = full_m4sugar; argv[1] = full_m4sugar;
argv[2] = "-"; argv[2] = "-";
argv[3] = full_cm4; argv[3] = full_cm4;
argv[4] = full_path; argv[4] = full_skeleton;
argv[5] = NULL; argv[5] = NULL;
init_subpipe (); init_subpipe ();
pid = create_subpipe (argv, filter_fd); pid = create_subpipe (argv, filter_fd);
free (full_m4sugar); free (full_m4sugar);
free (full_cm4); free (full_cm4);
free (full_path); free (full_skeleton);
out = fdopen (filter_fd[0], "w"); out = fdopen (filter_fd[0], "w");
if (! out) if (! out)