valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Merge branch 'svn/trunk'

Browse source
This commit is contained in:
Patryk Obara 2019-10-03 23:44:48 +02:00
commit a323e173c2
7 changed files with 338 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ints/bios_disk.cpp
View file

@ -196,7 +196,7 @@ Bit8u imageDisk::Write_AbsoluteSector(Bit32u sectnum, void *data) {
}
imageDisk::imageDisk(FILE *imgFile, Bit8u *imgName, Bit32u imgSizeK, bool isHardDisk) {
imageDisk::imageDisk(FILE *imgFile, const char *imgName, Bit32u imgSizeK, bool isHardDisk) {
heads = 0;
cylinders = 0;
sectors = 0;
@ -205,14 +205,8 @@ imageDisk::imageDisk(FILE *imgFile, Bit8u *imgName, Bit32u imgSizeK, bool isHard
last_action = NONE;
diskimg = imgFile;
fseek(diskimg,0,SEEK_SET);
memset(diskname,0,512);
if(strlen((const char *)imgName) > 511) {
memcpy(diskname, imgName, 511);
} else {
strcpy((char *)diskname, (const char *)imgName);
}
safe_strncpy(diskname, imgName, sizeof(diskname));
active = false;
hardDrive = isHardDisk;
if(!isHardDisk) {