flaneth

@@ -24,7 +24,7 @@

 */

 uint32_t DFS_GetPtnStart(uint8_t unit, uint8_t *scratchsector, uint8_t pnum, uint8_t *pactive, uint8_t *pptype, uint32_t *psize)

 {

-	uint32_t result;

+	uint32_t result = 0;

 	PMBR mbr = (PMBR) scratchsector;

 	// DOS ptable supports maximum 4 partitions

@@ -161,7 +161,7 @@ uint32_t DFS_GetVolInfo(uint8_t unit, uint8_t *scratchsector, uint32_t startsect

 */

 uint32_t DFS_GetFAT(PVOLINFO volinfo, uint8_t *scratch, uint32_t *scratchcache, uint32_t cluster)

 {

-	uint32_t offset, sector, result;

+	uint32_t offset = 0, sector = 0, result = 0;

 	if (volinfo->filesystem == FAT12) {

 		offset = cluster + (cluster / 2);

@@ -256,7 +256,7 @@ uint32_t DFS_GetFAT(PVOLINFO volinfo, uint8_t *scratch, uint32_t *scratchcache,

 */

 uint32_t DFS_SetFAT(PVOLINFO volinfo, uint8_t *scratch, uint32_t *scratchcache, uint32_t cluster, uint32_t new_contents)

 {

-	uint32_t offset, sector, result;

+	uint32_t offset = 0, sector = 0, result = 0;

 	if (volinfo->filesystem == FAT12) {

 		offset = cluster + (cluster / 2);

 		new_contents &=0xfff;

@@ -379,7 +379,7 @@ uint32_t DFS_SetFAT(PVOLINFO volinfo, uint8_t *scratch, uint32_t *scratchcache,

 		// 4 bits of the FAT32 cluster value. It's unclear what these bits will be used

 		// for; in every example I've encountered they are always zero.

 		result = DFS_WriteSector(volinfo->unit, scratch, *scratchcache, 1);

-		// mirror the FAT into copy 2

+		// mirror the FAT into copy 2 - XXX

 		if (DFS_OK == result)

 			result = DFS_WriteSector(volinfo->unit, scratch, (*scratchcache)+volinfo->secperfat, 1);

 	}

@@ -641,7 +641,7 @@ uint32_t DFS_GetNext(PVOLINFO volinfo, PDIRINFO dirinfo, PDIRENT dirent)

 */

 uint32_t DFS_GetFreeDirEnt(PVOLINFO volinfo, uint8_t *path, PDIRINFO di, PDIRENT de)

 {

-	uint32_t tempclus,i;

+	uint32_t tempclus = 0, i = 0;

 	if (DFS_OpenDir(volinfo, path, di))

 		return DFS_NOTFOUND;

@@ -870,10 +870,10 @@ uint32_t DFS_OpenFile(PVOLINFO volinfo, uint8_t *path, uint8_t mode, uint8_t *sc

 */

 uint32_t DFS_ReadFile(PFILEINFO fileinfo, uint8_t *scratch, uint8_t *buffer, uint32_t *successcount, uint32_t len)

 {

-	uint32_t remain;

+	uint32_t remain = 0;

 	uint32_t result = DFS_OK;

-	uint32_t sector;

-	uint32_t bytesread;

+	uint32_t sector = 0;

+	uint32_t bytesread = 0;

 	// Don't try to read past EOF

 	if (len > fileinfo->filelen - fileinfo->pointer)

@@ -976,7 +976,8 @@ uint32_t DFS_ReadFile(PFILEINFO fileinfo, uint8_t *scratch, uint8_t *buffer, uin

 */

 void DFS_Seek(PFILEINFO fileinfo, uint32_t offset, uint8_t *scratch)

 {

-	uint32_t tempint;

+	uint32_t tempint = 0;

+        uint16_t endcluster = 0;

 	// larwe 9/16/06 bugfix split case 0a/0b and changed fallthrough handling

 	// Case 0a - Return immediately for degenerate case

@@ -1021,10 +1022,9 @@ void DFS_Seek(PFILEINFO fileinfo, uint32_t offset, uint8_t *scratch)

 		  fileinfo->volinfo->secperclus * SECTOR_SIZE;

 		// seek by clusters

-		// larwe 9/30/06 bugfix changed .rem to .quot in both div calls

-		while (div(fileinfo->pointer, fileinfo->volinfo->secperclus * SECTOR_SIZE).quot !=

-		  div(fileinfo->pointer + offset, fileinfo->volinfo->secperclus * SECTOR_SIZE).quot) {

-

+		// canny/reza 5/7  added endcluster related code

+		endcluster = div(offset, fileinfo->volinfo->secperclus * SECTOR_SIZE).quot;

+		while ((uint16_t)div(fileinfo->pointer, fileinfo->volinfo->secperclus * SECTOR_SIZE).quot != endcluster) {

 			fileinfo->cluster = DFS_GetFAT(fileinfo->volinfo, scratch, &tempint, fileinfo->cluster);

 			// Abort if there was an error

 			if (fileinfo->cluster == 0x0ffffff7) {

@@ -1048,7 +1048,7 @@ uint32_t DFS_UnlinkFile(PVOLINFO volinfo, uint8_t *path, uint8_t *scratch)

 {

 	FILEINFO fi;

 	uint32_t cache = 0;

-	uint32_t tempclus;

+	uint32_t tempclus = 0;

 	// DFS_OpenFile gives us all the information we need to delete it

 	if (DFS_OK != DFS_OpenFile(volinfo, path, DFS_READ, scratch, &fi))

@@ -1083,10 +1083,10 @@ uint32_t DFS_UnlinkFile(PVOLINFO volinfo, uint8_t *path, uint8_t *scratch)

 */

 uint32_t DFS_WriteFile(PFILEINFO fileinfo, uint8_t *scratch, uint8_t *buffer, uint32_t *successcount, uint32_t len)

 {

-	uint32_t remain;

+	uint32_t remain = 0;

 	uint32_t result = DFS_OK;

-	uint32_t sector;

-	uint32_t byteswritten;

+	uint32_t sector = 0;

+	uint32_t byteswritten = 0;

 	// Don't allow writes to a file that's open as readonly

 	if (!(fileinfo->mode & DFS_WRITE))