lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Don't allocate input files on the stack.

Browse source
This commit is contained in:
Eelco Dolstra 2007-08-07 15:00:13 +00:00
parent 4cad125e08
commit d71cc503a6
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libexpr/parser.y
View file

@ -383,20 +383,8 @@ Expr parseExprFromFile(EvalState & state, Path path)
if (S_ISDIR(st.st_mode))
path = canonPath(path + "/default.nix");
/* Read the input file. We can't use SGparseFile() because it's
broken, so we read the input ourselves and call
SGparseString(). */
AutoCloseFD fd = open(path.c_str(), O_RDONLY);
if (fd == -1) throw SysError(format("opening `%1%'") % path);
if (fstat(fd, &st) == -1)
throw SysError(format("statting `%1%'") % path);
char text[st.st_size + 1];
readFull(fd, (unsigned char *) text, st.st_size);
text[st.st_size] = 0;
return parse(state, text, path, dirOf(path));
/* Read and parse the input file. */
return parse(state, readFile(path).c_str(), path, dirOf(path));
}