TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libutil: Limit readLink() error to only overflows. 

Let's not just improve the error message itself, but also the behaviour
to actually work around the ntfs-3g symlink bug. If the readlink() call
returns a smaller size than the stat() call, this really isn't a problem
even if the symlink target really has changed between the calls.

So if stat() reports the size for the absolute path, it's most likely
that the relative path is smaller and thus it should also work for file
system bugs as mentioned in 93002d69fc58c2b71e2dfad202139230c630c53a.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: John Ericson <Ericson2314@Yahoo.com>
This commit is contained in:
aszlig 2015-01-02 03:45:47 +01:00 committed by Ludovic Courtès
parent 0fed5fde65
commit 0b9c4a8b80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/libutil/util.cc
View File

@ -196,8 +196,8 @@ Path readLink(const Path & path)
ssize_t rlsize = readlink(path.c_str(), buf, st.st_size);
if (rlsize == -1)
throw SysError(format("reading symbolic link '%1%'") % path);
else if (rlsize != st.st_size)
throw Error(format("symbolic link '%1%' size mismatch %2% != %3%")
else if (rlsize > st.st_size)
throw Error(format("symbolic link ‘%1%’ size overflow %2% > %3%")
% path % rlsize % st.st_size);
return string(buf, st.st_size);
}