i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NTFS: More fixes for #8332

Browse Source 
* Generate name for unnamed volumes
+alpha 4
This commit is contained in:
threedeyes
2012-11-02 13:42:41 +00:00
parent 82fc1a8f3c
commit 1d910b5e2b
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ntfs/fs_func.c
+28 -7
View File
@@ -36,6 +36,7 @@
#include <driver_settings.h> #include <driver_settings.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <disk_device_manager.h>
#include "attributes.h" #include "attributes.h"
#include "fake_attributes.h" #include "fake_attributes.h"
@@ -43,11 +44,11 @@
#include "ntfs.h" #include "ntfs.h"
#include "volume_util.h" #include "volume_util.h"
static const char* kNTFSUntitled = {"NTFS Untitled"}; static const char* kNTFSUnnamed = {"NTFS Unnamed"};
typedef struct identify_cookie { typedef struct identify_cookie {
NTFS_BOOT_SECTOR boot; NTFS_BOOT_SECTOR boot;
char label[256]; char label[MAX_PATH];
} identify_cookie; } identify_cookie;
@@ -257,10 +258,11 @@ fs_identify_partition(int fd, partition_data *partition, void **_cookie)
return -1; return -1;
} }
strcpy(cookie->label, kNTFSUntitled); cookie->label[0]='\0';
memcpy(&cookie->boot, &boot, 512);
// try get path for device // get path for device
if (ioctl(fd, B_GET_PATH_FOR_DEVICE, devpath)) { if (ioctl(fd, B_GET_PATH_FOR_DEVICE, devpath) != 0) {
// try mount // try mount
ntVolume = utils_mount_volume(devpath, MS_RDONLY | MS_RECOVER); ntVolume = utils_mount_volume(devpath, MS_RDONLY | MS_RECOVER);
if (ntVolume != NULL) { if (ntVolume != NULL) {
@@ -270,7 +272,26 @@ fs_identify_partition(int fd, partition_data *partition, void **_cookie)
} }
} }
memcpy(&cookie->boot, &boot, 512); // generate a more or less descriptive name for unnamed volume
if (cookie->label[0]=='\0') {
double size;
off_t diskSize = sle64_to_cpu(boot.number_of_sectors)
* le16_to_cpu(boot.bpb.bytes_per_sector);
off_t divisor = 1ULL << 40;
char unit = 'T';
if (diskSize < divisor) {
divisor = 1UL << 30;
unit = 'G';
if (diskSize < divisor) {
divisor = 1UL << 20;
unit = 'M';
}
}
size = (double)((10 * diskSize + divisor - 1) / divisor);
snprintf(cookie->label, MAX_PATH - 1, "%g %cB NTFS File System",
size / 10, unit);
}
*_cookie = cookie; *_cookie = cookie;
@@ -468,7 +489,7 @@ fs_rfsstat(fs_volume *_vol, struct fs_info *fss)
break; break;
} }
if (i < 0) if (i < 0)
strcpy(fss->volume_name, kNTFSUntitled); strcpy(fss->volume_name, kNTFSUnnamed);
else else
fss->volume_name[i + 1] = 0; fss->volume_name[i + 1] = 0;