maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* 64-bit compatibility fixes (for problems revealed by building on an Athlon

Browse source 
64 running 64-bit SUSE).  A patched ATerm library is required to run Nix
  succesfully.
This commit is contained in:
Eelco Dolstra 2006-05-11 02:19:43 +00:00
parent e3c07782d1
commit 9d72bf8835
10 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/util.cc
View file

@ -119,7 +119,7 @@ Path canonPath(const Path & path, bool resolveSymlinks)
Path dirOf(const Path & path)
{
unsigned int pos = path.rfind('/');
Path::size_type pos = path.rfind('/');
if (pos == string::npos)
throw Error(format("invalid file name: %1%") % path);
return pos == 0 ? "/" : Path(path, 0, pos);
@ -128,7 +128,7 @@ Path dirOf(const Path & path)
string baseNameOf(const Path & path)
{
unsigned int pos = path.rfind('/');
Path::size_type pos = path.rfind('/');
if (pos == string::npos)
throw Error(format("invalid file name %1% ") % path);
return string(path, pos + 1);