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

Added partitionMapName parameter to get_nth_partition_info(). Added the new fields to the output.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2557 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2003-01-26 15:14:59 +00:00
parent cd34fb229b
commit 9d192d5917
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tests/add-ons/kernel/disk_scanner/DiskScannerTest.cpp
View File

@ -55,13 +55,19 @@ get_nth_session_info(int deviceFD, int32 index, session_info *sessionInfo)
\param partitionIndex The partition index. \param partitionIndex The partition index.
\param partitionInfo Pointer to a pre-allocated extended_partition_info \param partitionInfo Pointer to a pre-allocated extended_partition_info
to be filled out by the function. to be filled out by the function.
\param partitionMapName Pointer to a pre-allocated char buffer of minimal
size \c B_FILE_NAME_LENGTH, into which the short name of the
partitioning system shall be written. The result is the empty
string (""), if no partitioning system is used (e.g. for floppies).
May be \c NULL.
\return \return
- \c B_OK: Everything went fine. - \c B_OK: Everything went fine.
- an error code: The contents of \a partitionInfo is undefined. - an error code: The contents of \a partitionInfo is undefined.
*/ */
status_t status_t
get_nth_partition_info(int deviceFD, int32 sessionIndex, int32 partitionIndex, get_nth_partition_info(int deviceFD, int32 sessionIndex, int32 partitionIndex,
extended_partition_info *partitionInfo) extended_partition_info *partitionInfo,
char *partitionMapName)
{ {
if (partitionInfo == NULL) if (partitionInfo == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
@ -95,7 +101,7 @@ get_nth_partition_info(int deviceFD, int32 sessionIndex, int32 partitionIndex,
// the its path by recursively searching the /dev/disk directory. // the its path by recursively searching the /dev/disk directory.
partitionInfo->info.device[0] = '\0'; partitionInfo->info.device[0] = '\0';
error = diskScanner->get_nth_partition_info(deviceFD, &sessionInfo, error = diskScanner->get_nth_partition_info(deviceFD, &sessionInfo,
partitionIndex, partitionInfo, NULL); partitionIndex, partitionInfo, partitionMapName, NULL);
} }
// get the FS info // get the FS info
if (error == B_OK) { if (error == B_OK) {
@ -112,6 +118,7 @@ partitionInfo->info.device[0] = '\0';
partitionInfo->file_system_long_name[0] = '\0'; partitionInfo->file_system_long_name[0] = '\0';
partitionInfo->volume_name[0] = '\0'; partitionInfo->volume_name[0] = '\0';
partitionInfo->mounted_at[0] = '\0'; partitionInfo->mounted_at[0] = '\0';
partitionInfo->file_system_flags = 0;
} }
// NOTE: Where do we get mounted_at from? // NOTE: Where do we get mounted_at from?
// Update: Actually, it looks, like it is really hard. We could traverse the // Update: Actually, it looks, like it is really hard. We could traverse the
@ -303,13 +310,14 @@ print_partition_info(const char *prefix, const extended_partition_info &info)
printf("%spartition ID: %ld\n", prefix, info.info.partition); printf("%spartition ID: %ld\n", prefix, info.info.partition);
printf("%sdevice: `%s'\n", prefix, info.info.device); printf("%sdevice: `%s'\n", prefix, info.info.device);
printf("%sflags: %lx\n", prefix, info.flags); printf("%sflags: %lx\n", prefix, info.flags);
printf("%spartition code: 0x%x\n", prefix, info.partition_code); printf("%spartition code: 0x%lx\n", prefix, info.partition_code);
printf("%spartition name: `%s'\n", prefix, info.partition_name); printf("%spartition name: `%s'\n", prefix, info.partition_name);
printf("%spartition type: `%s'\n", prefix, info.partition_type); printf("%spartition type: `%s'\n", prefix, info.partition_type);
printf("%sFS short name: `%s'\n", prefix, info.file_system_short_name); printf("%sFS short name: `%s'\n", prefix, info.file_system_short_name);
printf("%sFS long name: `%s'\n", prefix, info.file_system_long_name); printf("%sFS long name: `%s'\n", prefix, info.file_system_long_name);
printf("%svolume name: `%s'\n", prefix, info.volume_name); printf("%svolume name: `%s'\n", prefix, info.volume_name);
printf("%smounted at: `%s'\n", prefix, info.mounted_at); printf("%smounted at: `%s'\n", prefix, info.mounted_at);
printf("%sFS flags: 0x%lx\n", prefix, info.file_system_flags);
} }
// main // main
@ -365,13 +373,18 @@ main(int argc, char **argv)
for (int32 k = 0; ; k++) { for (int32 k = 0; ; k++) {
extended_partition_info partitionInfo; extended_partition_info partitionInfo;
status = get_nth_partition_info(device, i, k, &partitionInfo); char partitionMapName[B_FILE_NAME_LENGTH];
status = get_nth_partition_info(device, i, k, &partitionInfo,
partitionMapName);
if (status < B_OK) { if (status < B_OK) {
if (status != B_ENTRY_NOT_FOUND) if (status != B_ENTRY_NOT_FOUND)
fprintf(stderr, "get_nth_partition_info() failed: %s\n", strerror(status)); fprintf(stderr, "get_nth_partition_info() failed: %s\n", strerror(status));
break; break;
} }
if (k == 0)
printf(" partition map: `%s'\n", partitionMapName);
printf(" partition %ld_%ld\n", i, k); printf(" partition %ld_%ld\n", i, k);
print_partition_info(" ", partitionInfo); print_partition_info(" ", partitionInfo);
} }