Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libroot_build: Fix issues with attribute FD for symlink

Browse Source 
AttributeDescriptor: Don't use dup() directly. Check, if the given FD is
one we track and clone it respectively. This allows use with symlink FDs
which we have to fake on Linux (since symlinks cannot be opened). Fixes
extraction of packages containing symlinks with attributes.
This commit is contained in:
Ingo Weinhold 2013-05-25 02:38:52 +02:00
parent e2f30519ab
commit 3da422ad05
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/build/libroot/fs_descriptors.cpp
View File

@ -23,6 +23,8 @@
#include <fs_attr.h>
#include <syscalls.h>
#include "fs_impl.h"
using std::map;
@ -35,6 +37,27 @@ static DescriptorMap *sDescriptors;
namespace BPrivate {
static int
dup_maybe_system(int fd)
{
if (get_descriptor(fd) != NULL)
return _kern_dup(fd);
int clonedFD = dup(fd);
return clonedFD >= 0 ? clonedFD : errno;
}
static status_t
close_maybe_system(int fd)
{
if (get_descriptor(fd) != NULL)
return _kern_close(fd);
return close(fd) == 0 ? B_OK : errno;
}
// #pragma mark - Descriptor
@ -263,7 +286,7 @@ SymlinkDescriptor::GetPath(string& path) const
AttributeDescriptor::AttributeDescriptor(int fileFD, const char* attribute,
uint32 type, int openMode)
:
fFileFD(dup(fileFD)),
fFileFD(dup_maybe_system(fileFD)),
fType(type),
fOpenMode(openMode),
fData(NULL),
@ -377,7 +400,7 @@ AttributeDescriptor::Close()
if (fFileFD < 0)
return B_BAD_VALUE;
close(fFileFD);
close_maybe_system(fFileFD);
fFileFD = -1;
free(fData);