80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1209 from mattx433/feature/mo_posix

Browse Source 
Make mo_format use POSIX functions instead of Win32 ones
This commit is contained in:
Miran Grča
2021-01-07 14:02:56 +01:00
committed by GitHub
parent afb896f1eb 55fd5652a8
commit 26fe5dcca4
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/disk/mo.c
View File

@@ -22,6 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#include <unistd.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include <86box/86box.h>
@@ -42,7 +43,7 @@
#include <windows.h>
#include <io.h>
#else
#include <unistd.h>
#include <errno.h>
#endif
mo_drive_t mo_drives[MO_NUM];
@@ -1041,46 +1042,41 @@ mo_format(mo_t *dev)
{
unsigned long size;
int ret;
int fd;
int fd = fileno(dev->drv->f);
int64_t liSize = 0;
mo_log("MO %i: Formatting media...\n", dev->id);
if (fd == -1) {
mo_log("MO %i: Failed to get file descriptor.\n", dev->id);
return;
}
fseek(dev->drv->f, 0, SEEK_END);
size = (uint32_t) ftello64(dev->drv->f);
HANDLE fh;
LARGE_INTEGER liSize;
errno = 0;
rewind(dev->drv->f);
fd = _fileno(dev->drv->f);
fh = (HANDLE)_get_osfhandle(fd);
liSize.QuadPart = 0;
ret = (int)SetFilePointerEx(fh, liSize, NULL, FILE_BEGIN);
if (!ret) {
if (errno) {
mo_log("MO %i: Failed seek to start of image file\n", dev->id);
return;
}
ret = (int)SetEndOfFile(fh);
if (!ret) {
ret = ftruncate(fd, 0);
if (ret == -1) {
mo_log("MO %i: Failed to truncate image file to 0\n", dev->id);
return;
}
liSize.QuadPart = size;
ret = (int)SetFilePointerEx(fh, liSize, NULL, FILE_BEGIN);
if (!ret) {
liSize = size;
ret = fseek(dev->drv->f, 0, SEEK_END);
if (ret == -1) {
mo_log("MO %i: Failed seek to end of image file\n", dev->id);
return;
}
ret = (int)SetEndOfFile(fh);
if (!ret) {
ret = ftruncate(fd, liSize);
if (ret == -1) {
mo_log("MO %i: Failed to truncate image file to %llu\n", dev->id, size);
return;
}