aaru-dps/fstester
1
0
Fork 0
mirror of https://github.com/aaru-dps/fstester.git synced 2025-12-16 19:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix using signed return codes for DOS.

Browse Source
This commit is contained in:
Natalia Portillo
2021-03-11 04:44:00 +00:00
parent 4542f64b00
commit 055a54edbb
8 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setter/src/dos/attr.c
View File

@@ -47,7 +47,8 @@ void FileAttributes(const char* path)
{ {
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
unsigned total, actionTaken; unsigned total, actionTaken;
int rc, wRc, cRc, handle; unsigned int rc, wRc, cRc;
int handle;
int i; int i;
if(driveNo > 32) driveNo -= 32; if(driveNo > 32) driveNo -= 32;

6
setter/src/dos/deleted.c
View File

@@ -45,9 +45,9 @@ Copyright (C) 2011-2021 Natalia Portillo
void DeleteFiles(const char* path) void DeleteFiles(const char* path)
{ {
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
int rc = 0; unsigned int rc;
char filename[9]; char filename[9];
short pos = 0; short pos;
unsigned total; unsigned total;
int handle; int handle;
@@ -64,7 +64,7 @@ void DeleteFiles(const char* path)
return; return;
} }
rc = chdir("DELETED"); chdir("DELETED");
printf("Creating and deleting files.\n"); printf("Creating and deleting files.\n");

2
setter/src/dos/dirdepth.c
View File

@@ -46,7 +46,7 @@ Copyright (C) 2011-2021 Natalia Portillo
void DirectoryDepth(const char* path) void DirectoryDepth(const char* path)
{ {
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
int rc = 0; unsigned int rc ;
unsigned total; unsigned total;
char filename[9]; char filename[9];
long pos = 2; long pos = 2;

4
setter/src/dos/filename.c
View File

@@ -46,7 +46,7 @@ Copyright (C) 2011-2021 Natalia Portillo
void Filenames(const char* path) void Filenames(const char* path)
{ {
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
int rc = 0, wRc = 0, cRc = 0; unsigned int rc, wRc = 0, cRc = 0;
unsigned actionTaken, total; unsigned actionTaken, total;
int handle; int handle;
char message[300]; char message[300];
@@ -65,7 +65,7 @@ void Filenames(const char* path)
return; return;
} }
rc = chdir("FILENAME"); chdir("FILENAME");
printf("Creating files with different filenames.\n"); printf("Creating files with different filenames.\n");

4
setter/src/dos/files.c
View File

@@ -45,7 +45,7 @@ Copyright (C) 2011-2021 Natalia Portillo
void MillionFiles(const char* path) void MillionFiles(const char* path)
{ {
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
int rc = 0; unsigned int rc;
char filename[9]; char filename[9];
unsigned long pos = 0; unsigned long pos = 0;
int handle; int handle;
@@ -64,7 +64,7 @@ void MillionFiles(const char* path)
return; return;
} }
rc = chdir("MILLION"); chdir("MILLION");
printf("Creating lots of files.\n"); printf("Creating lots of files.\n");

16
setter/src/dos/frag.c
View File

@@ -47,14 +47,14 @@ Copyright (C) 2011-2021 Natalia Portillo
void Fragmentation(const char* path, size_t clusterSize) void Fragmentation(const char* path, size_t clusterSize)
{ {
size_t halfCluster = clusterSize / 2; unsigned int halfCluster = clusterSize / 2;
size_t quarterCluster = clusterSize / 4; unsigned int quarterCluster = clusterSize / 4;
size_t twoCluster = clusterSize * 2; unsigned int twoCluster = clusterSize * 2;
size_t threeQuartersCluster = halfCluster + quarterCluster; unsigned int threeQuartersCluster = halfCluster + quarterCluster;
size_t twoAndThreeQuartCluster = threeQuartersCluster + twoCluster; unsigned int twoAndThreeQuartCluster = threeQuartersCluster + twoCluster;
unsigned char* buffer; unsigned char* buffer;
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
int rc = 0, wRc = 0, cRc = 0; unsigned int rc, wRc = 0, cRc = 0;
unsigned total, actionTaken = 0; unsigned total, actionTaken = 0;
int handle; int handle;
long i; long i;
@@ -72,7 +72,7 @@ void Fragmentation(const char* path, size_t clusterSize)
return; return;
} }
rc = chdir("FRAGS"); chdir("FRAGS");
rc = _dos_creatnew("HALFCLST", _A_NORMAL, &handle); rc = _dos_creatnew("HALFCLST", _A_NORMAL, &handle);
if(!rc) if(!rc)
@@ -221,7 +221,7 @@ void Fragmentation(const char* path, size_t clusterSize)
} }
printf("\tDeleting \"TWO1\".\n"); printf("\tDeleting \"TWO1\".\n");
rc = unlink("TWO1"); unlink("TWO1");
printf("\tDeleting \"TWO3\".\n"); printf("\tDeleting \"TWO3\".\n");
rc = unlink("TWO3"); rc = unlink("TWO3");

2
setter/src/dos/time.c
View File

@@ -47,7 +47,7 @@ Copyright (C) 2011-2021 Natalia Portillo
void Timestamps(const char* path) void Timestamps(const char* path)
{ {
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
int rc = 0, wRc = 0, cRc = 0, tRc = 0; unsigned int rc, wRc = 0, cRc = 0, tRc = 0;
unsigned actionTaken, total; unsigned actionTaken, total;
int handle; int handle;
char message[300]; char message[300];

10
setter/src/dos/volume.c
View File

@@ -43,20 +43,20 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
char driveNo = path[0] - '@'; char driveNo = path[0] - '@';
struct diskfree_t oldFreeSpace; struct diskfree_t oldFreeSpace;
struct diskfree_ex_t freeSpace; struct diskfree_ex_t freeSpace;
unsigned int ret; unsigned int rc;
memset(&oldFreeSpace, 0, sizeof(struct diskfree_t)); memset(&oldFreeSpace, 0, sizeof(struct diskfree_t));
memset(&freeSpace, 0, sizeof(struct diskfree_ex_t)); memset(&freeSpace, 0, sizeof(struct diskfree_ex_t));
if(driveNo > 32) driveNo -= 32; if(driveNo > 32) driveNo -= 32;
ret = _dos_getdiskfree_ex(driveNo, &freeSpace); rc = _dos_getdiskfree_ex(driveNo, &freeSpace);
if(ret) if(rc)
{ {
if(errno == ENOSYS) if(errno == ENOSYS)
{ {
ret = _dos_getdiskfree(driveNo, &oldFreeSpace); rc = _dos_getdiskfree(driveNo, &oldFreeSpace);
freeSpace.sectorsPerCluster = oldFreeSpace.sectors_per_cluster; freeSpace.sectorsPerCluster = oldFreeSpace.sectors_per_cluster;
freeSpace.freeClusters = oldFreeSpace.avail_clusters; freeSpace.freeClusters = oldFreeSpace.avail_clusters;
freeSpace.bytesPerSector = oldFreeSpace.bytes_per_sector; freeSpace.bytesPerSector = oldFreeSpace.bytes_per_sector;
@@ -69,7 +69,7 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
} }
} }
if(ret == 0) if(rc == 0)
{ {
printf("\tBytes per sector: %lu\n", freeSpace.bytesPerSector); printf("\tBytes per sector: %lu\n", freeSpace.bytesPerSector);
printf("\tSectors per cluster: %lu (%lu bytes)\n", printf("\tSectors per cluster: %lu (%lu bytes)\n",