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

Include architecture in package links dir names

Browse Source
This commit is contained in:
Ingo Weinhold 2011-06-27 06:51:40 +02:00
parent ba926f3554
commit 7e346f1677
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp
View File

@ -56,17 +56,30 @@ PackageLinkDirectory::Init(Directory* parent, Package* package)
// + 1 for the '-' // + 1 for the '-'
} }
const char* architecture = package->ArchitectureName();
if (architecture != NULL) {
size += 1 + strlen(architecture);
// + 1 for the '-'
}
// allocate the name and compose it // allocate the name and compose it
char* name = (char*)malloc(size); char* name = (char*)malloc(size);
if (name == NULL) if (name == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
memcpy(name, package->Name(), nameLength + 1); memcpy(name, package->Name(), nameLength + 1);
if (version != NULL) { if (version != NULL) {
name[nameLength] = '-'; name[nameLength] = '-';
version->ToString(name + nameLength + 1, size - nameLength - 1); version->ToString(name + nameLength + 1, size - nameLength - 1);
} }
if (architecture != NULL) {
nameLength += strlen(name + nameLength);
name[nameLength] = '-';
strlcpy(name + nameLength + 1, architecture, size - nameLength - 1);
}
// init the directory/node // init the directory/node
status_t error = Init(parent, name, NODE_FLAG_KEEP_NAME); status_t error = Init(parent, name, NODE_FLAG_KEEP_NAME);
if (error != B_OK) if (error != B_OK)