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 protection error when checking if there's a cookie jar in Atari ST.

Browse Source
This commit is contained in:
Natalia Portillo
2021-05-16 07:19:08 +01:00
parent 1b5e2d98c6
commit 9297e2567d
3 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
setter/src/atarist/links.c
View File

@@ -35,14 +35,20 @@ Copyright (C) 2011-2021 Natalia Portillo
void Links(const char* path)
{
long** cookieJar = _p_cookies;
long cookie;
int rc;
FILE* h;
char driveNo = path[0] - '@';
long* cookieJar;
long cookie;
int rc;
FILE* h;
char driveNo = path[0] - '@';
long savessp;
// Retrieve pointer to cookie jar in Supervisor mode
savessp = Super(0L);
cookieJar = *_p_cookies;
Super((void*)savessp);
// Check for a cookie jar
if(*cookieJar == 0) return;
if(cookieJar == 0) return;
// Check if MiNT or MagiC
rc = (Getcookie(C_MiNT, &cookie) == E_OK) || (Getcookie(C_MagX, &cookie) == E_OK) ||

13
setter/src/atarist/os.c
View File

@@ -41,14 +41,14 @@ void GetOsInfo()
{
OSHEADER* osHeader;
unsigned short version;
long** cookieJar = _p_cookies;
long cookie = 0;
long* cookieJar;
long cookie = 0;
char type[5];
int rc;
struct _stemu_vars* stemu_vars;
struct _tos2win_vars* tos2win_vars;
MAGX_COOKIE* magic_vars;
int32_t savessp;
long savessp;
// Retrieve the OS data in Supervisor mode
savessp = Super(0L);
@@ -93,8 +93,13 @@ void GetOsInfo()
}
}
// Retrieve pointer to cookie jar in Supervisor mode
savessp = Super(0L);
cookieJar = *_p_cookies;
Super((void*)savessp);
// Check for a cookie jar
if(*cookieJar == 0) return;
if(cookieJar == 0) return;
// KAOS TOS
rc = Getcookie(C__T30, &cookie);

18
setter/src/atarist/perms.c
View File

@@ -37,14 +37,20 @@ Copyright (C) 2011-2021 Natalia Portillo
void FilePermissions(const char* path)
{
long** cookieJar = _p_cookies;
long cookie;
int rc, cRc, i;
FILE* file;
char driveNo = path[0] - '@';
long* cookieJar;
long cookie;
int rc, cRc, i;
FILE* file;
char driveNo = path[0] - '@';
long savessp;
// Retrieve pointer to cookie jar in Supervisor mode
savessp = Super(0L);
cookieJar = *_p_cookies;
Super((void*)savessp);
// Check for a cookie jar
if(*cookieJar == 0) return;
if(cookieJar == 0) return;
// Check if MiNT or MagiC
rc = (Getcookie(C_MiNT, &cookie) == E_OK) || (Getcookie(C_MagX, &cookie) == E_OK) ||