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

ntfs: Return better errors and handle volumes without names.

Browse Source 
Should fix #17390.

Change-Id: I8db797b29c70b452e98ebadc6825dba7626ad2ab
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4724
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Augustin Cavalier 2021-11-13 12:21:53 -05:00 committed by waddlesplash
parent d4e4909c6a
commit a82616528d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/kernel/file_systems/ntfs/kernel_interface.cpp
View File

@ -97,11 +97,14 @@ fs_scan_partition(int fd, partition_data* partition, void* _cookie)
char path[B_PATH_NAME_LENGTH];
if (ioctl(fd, B_GET_PATH_FOR_DEVICE, path) != 0) {
ntVolume = utils_mount_volume(path, NTFS_MNT_RDONLY | NTFS_MNT_RECOVER);
if (ntVolume != NULL) {
if (ntVolume->vol_name != NULL && ntVolume->vol_name[0] != '\0')
partition->content_name = strdup(ntVolume->vol_name);
ntfs_umount(ntVolume, true);
}
if (ntVolume == NULL)
return errno ? errno : B_ERROR;
if (ntVolume->vol_name != NULL && ntVolume->vol_name[0] != '\0')
partition->content_name = strdup(ntVolume->vol_name);
else
partition->content_name = strdup("");
ntfs_umount(ntVolume, true);
}
return partition->content_name != NULL ? B_OK : B_NO_MEMORY;