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

* Allow NULL name argument on initialization.

Browse Source 
* Some code beautification on the way.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22454 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2007-10-05 23:25:58 +00:00
parent d6e565c76b
commit aa4d8ee6ee
5 changed files with 115 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/kits/storage/Partition.cpp
View File

@ -980,11 +980,11 @@ status_t
BPartition::ValidateInitialize(const char *diskSystem, char *name,
const char *parameters)
{
if (!fPartitionData || !_IsShadow() || !diskSystem || !name)
if (!fPartitionData || !_IsShadow() || !diskSystem)
return B_BAD_VALUE;
return _kern_validate_initialize_partition(_ShadowID(), _ChangeCounter(),
diskSystem, name, parameters,
(parameters ? strlen(parameters)+1 : 0));
diskSystem, name, parameters,
(parameters ? strlen(parameters) + 1 : 0));
}
// Initialize
@ -992,11 +992,11 @@ status_t
BPartition::Initialize(const char *diskSystem, const char *name,
const char *parameters)
{
if (!fPartitionData || !_IsShadow() || !diskSystem || !name)
if (!fPartitionData || !_IsShadow() || !diskSystem)
return B_BAD_VALUE;
status_t error = _kern_initialize_partition(_ShadowID(), _ChangeCounter(),
diskSystem, name, parameters,
(parameters ? strlen(parameters)+1 : 0));
diskSystem, name, parameters,
(parameters ? strlen(parameters) + 1 : 0));
if (error == B_OK)
error = Device()->Update();
return error;

6
src/system/kernel/disk_device_manager/KFileSystem.cpp
View File

@ -165,9 +165,9 @@ bool
KFileSystem::ValidateInitialize(KPartition *partition, char *name,
const char *parameters)
{
return (partition && name && fModule && fModule->validate_initialize
&& fModule->validate_initialize(partition->PartitionData(), name,
parameters));
return (partition && fModule && fModule->validate_initialize
&& fModule->validate_initialize(partition->PartitionData(), name,
parameters));
}

4
src/system/kernel/disk_device_manager/KPartitioningSystem.cpp
View File

@ -314,7 +314,7 @@ bool
KPartitioningSystem::ValidateInitialize(KPartition *partition, char *name,
const char *parameters)
{
return (partition && name && fModule && fModule->validate_initialize
return (partition && fModule && fModule->validate_initialize
&& fModule->validate_initialize(partition->PartitionData(), name,
parameters));
}
@ -788,7 +788,7 @@ KPartitioningSystem::Initialize(KPartition *partition, const char *name,
const char *parameters, KDiskDeviceJob *job)
{
// check parameters
if (!partition || !job || !name /*|| !parameters*/)
if (!partition || !job /*|| !parameters*/)
return B_BAD_VALUE;
if (!fModule->initialize)
return B_ENTRY_NOT_FOUND;

9
src/system/kernel/disk_device_manager/ddm_operation_validation.cpp
View File

@ -401,20 +401,25 @@ BPrivate::DiskDevice::validate_initialize_partition(KPartition *partition,
int32 changeCounter, const char *diskSystemName, char *name,
const char *parameters, bool requireShadow)
{
if (!partition || !diskSystemName || !name)
if (!partition || !diskSystemName)
return B_BAD_VALUE;
// truncate name to maximal size
name[B_OS_NAME_LENGTH] = '\0';
if (name)
name[B_OS_NAME_LENGTH] = '\0';
// check the partition
status_t error = check_partition(partition, changeCounter, requireShadow);
if (error != B_OK)
return error;
// get the disk system
KDiskDeviceManager *manager = KDiskDeviceManager::Default();
KDiskSystem *diskSystem = manager->LoadDiskSystem(diskSystemName);
if (!diskSystem)
return B_ENTRY_NOT_FOUND;
DiskSystemLoader loader(diskSystem, true);
// get the info
if (diskSystem->ValidateInitialize(partition, name, parameters))
return B_OK;

170
src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
View File

@ -1022,40 +1022,52 @@ _user_validate_initialize_partition(partition_id partitionID,
int32 changeCounter, const char *_diskSystemName, char *_name,
const char *_parameters, size_t parametersSize)
{
if (!_diskSystemName || !_name
|| parametersSize > B_DISK_DEVICE_MAX_PARAMETER_SIZE) {
if (!_diskSystemName || parametersSize > B_DISK_DEVICE_MAX_PARAMETER_SIZE)
return B_BAD_VALUE;
}
// copy disk system name
char diskSystemName[B_DISK_SYSTEM_NAME_LENGTH];
char name[B_DISK_DEVICE_NAME_LENGTH];
char *parameters = NULL;
status_t error = ddm_strlcpy(diskSystemName, _diskSystemName,
B_DISK_SYSTEM_NAME_LENGTH);
if (!error)
// copy name
char name[B_DISK_DEVICE_NAME_LENGTH];
if (!error && _name)
error = ddm_strlcpy(name, _name, B_DISK_DEVICE_NAME_LENGTH, true);
if (error)
if (error != B_OK)
return error;
// copy parameters
char *parameters = NULL;
MemoryDeleter parameterDeleter;
if (_parameters) {
parameters = static_cast<char*>(malloc(parametersSize));
if (parameters)
user_memcpy(parameters, _parameters, parametersSize);
else
if (!parameters)
return B_NO_MEMORY;
parameterDeleter.SetTo(parameters);
if (user_memcpy(parameters, _parameters, parametersSize) != B_OK)
return B_BAD_ADDRESS;
}
KDiskDeviceManager *manager = KDiskDeviceManager::Default();
// get the partition
KDiskDeviceManager *manager = KDiskDeviceManager::Default();
KPartition *partition = manager->ReadLockPartition(partitionID);
error = partition ? (status_t)B_OK : (status_t)B_ENTRY_NOT_FOUND;
if (!error) {
PartitionRegistrar registrar1(partition, true);
PartitionRegistrar registrar2(partition->Device(), true);
DeviceReadLocker locker(partition->Device(), true);
error = validate_initialize_partition(partition, changeCounter,
diskSystemName, name, parameters);
}
if (!error)
if (!partition)
return B_ENTRY_NOT_FOUND;
// validate
PartitionRegistrar registrar1(partition, true);
PartitionRegistrar registrar2(partition->Device(), true);
DeviceReadLocker locker(partition->Device(), true);
error = validate_initialize_partition(partition, changeCounter,
diskSystemName, _name ? name : NULL, parameters);
// copy back the modified name
if (!error && _name)
error = ddm_strlcpy(_name, name, B_DISK_DEVICE_NAME_LENGTH);
free(parameters);
return error;
}
@ -1591,71 +1603,83 @@ _user_initialize_partition(partition_id partitionID, int32 changeCounter,
const char *_diskSystemName, const char *_name, const char *_parameters,
size_t parametersSize)
{
if (!_diskSystemName || !_name
|| parametersSize > B_DISK_DEVICE_MAX_PARAMETER_SIZE) {
if (!_diskSystemName || parametersSize > B_DISK_DEVICE_MAX_PARAMETER_SIZE)
return B_BAD_VALUE;
}
// copy disk system name
char diskSystemName[B_DISK_SYSTEM_NAME_LENGTH];
char name[B_DISK_DEVICE_NAME_LENGTH];
char *parameters = NULL;
status_t error = ddm_strlcpy(diskSystemName, _diskSystemName,
B_DISK_SYSTEM_NAME_LENGTH);
if (!error)
// copy name
char name[B_DISK_DEVICE_NAME_LENGTH];
if (!error && _name)
error = ddm_strlcpy(name, _name, B_DISK_DEVICE_NAME_LENGTH);
if (error)
return error;
// copy parameters
MemoryDeleter parameterDeleter;
char *parameters = NULL;
if (_parameters) {
parameters = static_cast<char*>(malloc(parametersSize));
if (parameters)
user_memcpy(parameters, _parameters, parametersSize);
else
if (!parameters)
return B_NO_MEMORY;
parameterDeleter.SetTo(parameters);
if (user_memcpy(parameters, _parameters, parametersSize) != B_OK)
return B_BAD_ADDRESS;
}
KDiskDeviceManager *manager = KDiskDeviceManager::Default();
// get the partition
KDiskDeviceManager *manager = KDiskDeviceManager::Default();
KPartition *partition = manager->WriteLockPartition(partitionID);
error = partition ? (status_t)B_OK : (status_t)B_ENTRY_NOT_FOUND;
if (!error) {
PartitionRegistrar registrar1(partition, true);
PartitionRegistrar registrar2(partition->Device(), true);
DeviceWriteLocker locker(partition->Device(), true);
// get the disk system
KDiskSystem *diskSystem = manager->LoadDiskSystem(diskSystemName);
error = diskSystem ? (status_t)B_OK : (status_t)B_ENTRY_NOT_FOUND;
if (!error) {
DiskSystemLoader loader(diskSystem, true);
// check parameters
char proposedName[B_DISK_DEVICE_NAME_LENGTH];
strcpy(proposedName, name);
error = validate_initialize_partition(partition, changeCounter,
diskSystemName, proposedName, parameters);
if (!error) {
error = !strcmp(name, proposedName) ? B_OK : B_BAD_VALUE;
}
if (!error) {
// unitialize the partition's contents and set the new
// parameters
error = partition->UninitializeContents(true);
}
if (!error) {
partition->SetDiskSystem(diskSystem);
error = partition->SetContentName(name);
}
if (!error) {
partition->Changed(B_PARTITION_CHANGED_CONTENT_NAME);
error = partition->SetContentParameters(parameters);
}
if (!error) {
partition->Changed(B_PARTITION_CHANGED_CONTENT_PARAMETERS);
partition->Changed(B_PARTITION_CHANGED_INITIALIZATION);
// implicit content disk system changes
error = partition->DiskSystem()->ShadowPartitionChanged(
partition, B_PARTITION_INITIALIZE);
}
}
}
free(parameters);
return error;
if (!partition)
return B_ENTRY_NOT_FOUND;
PartitionRegistrar registrar1(partition, true);
PartitionRegistrar registrar2(partition->Device(), true);
DeviceWriteLocker locker(partition->Device(), true);
// get the disk system
KDiskSystem *diskSystem = manager->LoadDiskSystem(diskSystemName);
if (!diskSystem)
return B_ENTRY_NOT_FOUND;
DiskSystemLoader loader(diskSystem, true);
// check parameters
char proposedName[B_DISK_DEVICE_NAME_LENGTH];
if (_name)
strcpy(proposedName, name);
error = validate_initialize_partition(partition, changeCounter,
diskSystemName, _name ? proposedName : NULL, parameters);
if (error != B_OK)
return error;
if (_name && strcmp(name, proposedName) != 0)
return B_BAD_VALUE;
// unitialize the partition's contents and set the new
// parameters
if ((error = partition->UninitializeContents(true)) != B_OK)
return error;
partition->SetDiskSystem(diskSystem);
if ((error = partition->SetContentName(_name ? name : NULL)) != B_OK)
return error;
partition->Changed(B_PARTITION_CHANGED_CONTENT_NAME);
if ((error = partition->SetContentParameters(parameters)) != B_OK)
return error;
partition->Changed(B_PARTITION_CHANGED_CONTENT_PARAMETERS);
partition->Changed(B_PARTITION_CHANGED_INITIALIZATION);
// implicit content disk system changes
return partition->DiskSystem()->ShadowPartitionChanged(
partition, B_PARTITION_INITIALIZE);
}