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

(output_skeleton): Use full path names when

Browse Source 
specifying a file to include; don't rely on include path, as
it's unreliable when the working file contains a file with
that name.
This commit is contained in:
Paul Eggert
2002-12-26 08:25:56 +00:00
parent 7eab453e1b
commit 2fd4e13193
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/output.c
View File

@@ -513,7 +513,7 @@ output_skeleton (void)
FILE *in; FILE *in;
FILE *out; FILE *out;
int filter_fd[2]; int filter_fd[2];
char const *argv[7]; char const *argv[6];
pid_t pid; pid_t pid;
/* Compute the names of the package data dir and skeleton file. /* Compute the names of the package data dir and skeleton file.
@@ -521,6 +521,8 @@ output_skeleton (void)
installation. A faulty installation can cause deadlock, so a installation. A faulty installation can cause deadlock, so a
cheap sanity check is worthwhile. */ cheap sanity check is worthwhile. */
char const m4sugar[] = "m4sugar/m4sugar.m4"; char const m4sugar[] = "m4sugar/m4sugar.m4";
char *full_m4sugar;
char *full_cm4;
char *full_path; char *full_path;
char const *p; char const *p;
char const *m4 = (p = getenv ("M4")) ? p : M4; char const *m4 = (p = getenv ("M4")) ? p : M4;
@@ -535,25 +537,29 @@ output_skeleton (void)
strcpy (full_path, pkgdatadir); strcpy (full_path, pkgdatadir);
full_path[pkgdatadirlen] = '/'; full_path[pkgdatadirlen] = '/';
strcpy (full_path + pkgdatadirlen + 1, m4sugar); strcpy (full_path + pkgdatadirlen + 1, m4sugar);
xfclose (xfopen (full_path, "r")); full_m4sugar = xstrdup (full_path);
strcpy (full_path + pkgdatadirlen + 1, "c.m4");
full_cm4 = xstrdup (full_path);
strcpy (full_path + pkgdatadirlen + 1, skeleton); strcpy (full_path + pkgdatadirlen + 1, skeleton);
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 -I %s %s - %s\n", fprintf (stderr, "running: %s %s - %s %s\n",
m4, pkgdatadir, m4sugar, full_path); m4, full_m4sugar, full_cm4, full_path);
argv[0] = m4; argv[0] = m4;
argv[1] = "-I"; argv[1] = full_m4sugar;
argv[2] = pkgdatadir; argv[2] = "-";
argv[3] = m4sugar; argv[3] = full_cm4;
argv[4] = "-"; argv[4] = full_path;
argv[5] = full_path; argv[5] = NULL;
argv[6] = NULL;
init_subpipe (); init_subpipe ();
pid = create_subpipe (argv, filter_fd); pid = create_subpipe (argv, filter_fd);
free (full_m4sugar);
free (full_cm4);
free (full_path); free (full_path);
out = fdopen (filter_fd[0], "w"); out = fdopen (filter_fd[0], "w");