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

clean up 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18743 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2006-09-04 21:57:36 +00:00
parent 3b57441c75
commit 482096e504
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/add-ons/kernel/file_systems/dos/dosfs.c
View File

@ -570,41 +570,39 @@ dosfs_identify_partition(int fd, partition_data *partition, void **_cookie)
char name[12]; char name[12];
identify_cookie *cookie; identify_cookie *cookie;
// read in the boot sector // read in the boot sector
if (read_pos(fd, 0, (void*)buf, 512) != 512) { if (read_pos(fd, 0, (void*)buf, 512) != 512) {
return 0.0f; return 0.0f;
} }
// only check boot signature on hard disks to account for broken mtools // only check boot signature on hard disks to account for broken mtools
// behavior // behavior
if (((buf[0x1fe] != 0x55) || (buf[0x1ff] != 0xaa)) && (buf[0x15] == 0xf8)) if (((buf[0x1fe] != 0x55) || (buf[0x1ff] != 0xaa)) && (buf[0x15] == 0xf8))
return 0.0f; return 0.0f;
if (!memcmp(buf+3, "NTFS ", 8) || !memcmp(buf+3, "HPFS ", 8)) {
if (!memcmp(buf+3, "NTFS ", 8) || !memcmp(buf+3, "HPFS ", 8)) {
return 0.0f; return 0.0f;
} }
// first fill in the universal fields from the bpb // first fill in the universal fields from the bpb
bytes_per_sector = read16(buf,0xb); bytes_per_sector = read16(buf,0xb);
if ((bytes_per_sector != 0x200) && (bytes_per_sector != 0x400) && (bytes_per_sector != 0x800)) { if ((bytes_per_sector != 0x200) && (bytes_per_sector != 0x400) && (bytes_per_sector != 0x800)) {
return 0.0f; return 0.0f;
} }
sectors_per_cluster = i = buf[0xd]; sectors_per_cluster = i = buf[0xd];
if ((i != 1) && (i != 2) && (i != 4) && (i != 8) && if ((i != 1) && (i != 2) && (i != 4) && (i != 8) &&
(i != 0x10) && (i != 0x20) && (i != 0x40) && (i != 0x80)) { (i != 0x10) && (i != 0x20) && (i != 0x40) && (i != 0x80)) {
return 0.0f; return 0.0f;
} }
reserved_sectors = read16(buf,0xe); reserved_sectors = read16(buf,0xe);
fat_count = buf[0x10]; fat_count = buf[0x10];
if ((fat_count == 0) || (fat_count > 8)) { if ((fat_count == 0) || (fat_count > 8)) {
return 0.0f; return 0.0f;
} }
// check media descriptor versus known types // check media descriptor versus known types
if ((buf[0x15] != 0xF0) && (buf[0x15] < 0xf8)) { if ((buf[0x15] != 0xF0) && (buf[0x15] < 0xf8)) {
return 0.0f; return 0.0f;
} }
@ -1158,7 +1156,7 @@ dosfs_fsync(void *_vol, void *_node)
if (check_vnode_magic(node, "dosfs_fsync")) { if (check_vnode_magic(node, "dosfs_fsync")) {
UNLOCK_VOL(vol); UNLOCK_VOL(vol);
return EINVAL; return EINVAL;
} }
if (node->cache) if (node->cache)
err = file_cache_sync(node->cache); err = file_cache_sync(node->cache);