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

* src/output.c (output_skeleton): Put an explicit path in front of

Browse Source 
the skeleton file name, rather than relying on the -I directory,
to partially alleviate effects of having a skeleton file lying around
in the current directory.
This commit is contained in:
Paul Hilfinger
2002-05-27 22:33:54 +00:00
parent 4a713ec2e3
commit 7067cb3620
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-05-27 Paul Hilfinger <Hilfinger@CS.Berkeley.EDU>
* src/output.c (output_skeleton): Put an explicit path in front of
the skeleton file name, rather than relying on the -I directory,
to partially alleviate effects of having a skeleton file lying around
in the current directory.
2002-05-27 Paul Hilfinger <Hilfinger@CS.Berkeley.EDU> 2002-05-27 Paul Hilfinger <Hilfinger@CS.Berkeley.EDU>
* src/conflicts.c (log_resolution): Correct typo: * src/conflicts.c (log_resolution): Correct typo:

14
src/output.c
View File

@@ -994,20 +994,30 @@ output_skeleton (void)
{ {
const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR"); const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR");
const char *m4 = getenv ("M4"); const char *m4 = getenv ("M4");
int pkg_data_len;
char *full_skeleton;
if (!m4) if (!m4)
m4 = M4; m4 = M4;
if (!bison_pkgdatadir) if (!bison_pkgdatadir)
bison_pkgdatadir = PKGDATADIR; bison_pkgdatadir = PKGDATADIR;
pkg_data_len = strlen (bison_pkgdatadir);
full_skeleton = XMALLOC (char, pkg_data_len + strlen (skeleton) + 1);
if (bison_pkgdatadir[pkg_data_len-1] == '/')
sprintf (full_skeleton, "%s%s", bison_pkgdatadir, skeleton);
else
sprintf (full_skeleton, "%s/%s", bison_pkgdatadir, skeleton);
if (trace_flag) if (trace_flag)
fprintf (stderr, fprintf (stderr,
"running: %s -I %s m4sugar/m4sugar.m4 %s %s\n", "running: %s -I %s m4sugar/m4sugar.m4 %s %s\n",
m4, bison_pkgdatadir, tempfile, skeleton); m4, bison_pkgdatadir, tempfile, full_skeleton);
skel_in = readpipe (m4, skel_in = readpipe (m4,
"-I", bison_pkgdatadir, "-I", bison_pkgdatadir,
"m4sugar/m4sugar.m4", "m4sugar/m4sugar.m4",
tempfile, tempfile,
skeleton, full_skeleton,
NULL); NULL);
XFREE (full_skeleton);
if (!skel_in) if (!skel_in)
error (EXIT_FAILURE, errno, "cannot run m4"); error (EXIT_FAILURE, errno, "cannot run m4");
skel_lex (); skel_lex ();