joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

add mount -ro option, to mount a local folder readonly, update DOS kernel to support returning "write protect" error code

Browse Source
This commit is contained in:
Jonathan Campbell 2018-02-08 00:29:25 -08:00
parent 1668afca41
commit 0d1beebfd1
5 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dos_inc.h
View File

@ -320,6 +320,7 @@ static INLINE Bit16u DOS_PackDate(Bit16u year,Bit16u mon,Bit16u day) {
#define DOSERR_REMOVE_CURRENT_DIRECTORY 16
#define DOSERR_NOT_SAME_DEVICE 17
#define DOSERR_NO_MORE_FILES 18
#define DOSERR_WRITE_PROTECTED 19
#define DOSERR_FILE_ALREADY_EXISTS 80

1
include/dos_system.h
View File

@ -268,6 +268,7 @@ public:
virtual const char * GetInfo(void);
char * GetBaseDir(void);
bool readonly;
char curdir[DOS_PATHLENGTH];
char info[256];
/* Can be overridden for example in iso images */

7
src/dos/dos_programs.cpp
View File

@ -246,6 +246,12 @@ public:
return;
}
bool readonly = false;
if (cmd->FindExist("-ro",true))
readonly = true;
if (cmd->FindExist("-rw",true))
readonly = false;
std::string type="dir";
cmd->FindString("-t",type,true);
bool iscdrom = (type =="cdrom"); //Used for mscdex bug cdrom label name emulation
@ -456,6 +462,7 @@ public:
LOG_MSG("ERROR:This build does not support physfs");
} else {
newdrive=new localDrive(temp_line.c_str(),sizes[0],bit8size,sizes[2],sizes[3],mediaid);
newdrive->readonly = readonly;
}
}
} else {

40
src/dos/drive_local.cpp
View File

@ -347,6 +347,11 @@ char *CodePageHostToGuest(const host_cnv_char_t *s) {
}
bool localDrive::FileCreate(DOS_File * * file,const char * name,Bit16u /*attributes*/) {
if (readonly) {
DOS_SetError(DOSERR_WRITE_PROTECTED);
return false;
}
//TODO Maybe care for attributes but not likely
char newname[CROSS_LEN];
strcpy(newname,basedir);
@ -360,6 +365,7 @@ bool localDrive::FileCreate(DOS_File * * file,const char * name,Bit16u /*attribu
host_cnv_char_t *host_name = CodePageGuestToHost(temp_name);
if (host_name == NULL) {
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,newname);
DOS_SetError(DOSERR_FILE_NOT_FOUND); // FIXME
return false;
}
@ -398,6 +404,13 @@ bool localDrive::FileCreate(DOS_File * * file,const char * name,Bit16u /*attribu
}
bool localDrive::FileOpen(DOS_File * * file,const char * name,Bit32u flags) {
if (readonly) {
if ((flags&0xf) == OPEN_WRITE || (flags&0xf) == OPEN_READWRITE) {
DOS_SetError(DOSERR_WRITE_PROTECTED);
return false;
}
}
const host_cnv_char_t * type;
switch (flags&0xf) {
case OPEN_READ: type = _HT("rb"); break;
@ -434,6 +447,7 @@ bool localDrive::FileOpen(DOS_File * * file,const char * name,Bit32u flags) {
host_cnv_char_t *host_name = CodePageGuestToHost(newname);
if (host_name == NULL) {
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,newname);
DOS_SetError(DOSERR_FILE_NOT_FOUND);
return false;
}
@ -519,6 +533,11 @@ bool localDrive::GetSystemFilename(char *sysName, char const * const dosName) {
}
bool localDrive::FileUnlink(const char * name) {
if (readonly) {
DOS_SetError(DOSERR_WRITE_PROTECTED);
return false;
}
char newname[CROSS_LEN];
strcpy(newname,basedir);
strcat(newname,name);
@ -529,6 +548,7 @@ bool localDrive::FileUnlink(const char * name) {
host_cnv_char_t *host_name = CodePageGuestToHost(fullname);
if (host_name == NULL) {
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,fullname);
DOS_SetError(DOSERR_FILE_NOT_FOUND);
return false;
}
@ -706,6 +726,7 @@ bool localDrive::GetFileAttr(const char * name,Bit16u * attr) {
host_cnv_char_t *host_name = CodePageGuestToHost(newname);
if (host_name == NULL) {
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,newname);
DOS_SetError(DOSERR_FILE_NOT_FOUND);
return false;
}
@ -720,6 +741,11 @@ bool localDrive::GetFileAttr(const char * name,Bit16u * attr) {
}
bool localDrive::MakeDir(const char * dir) {
if (readonly) {
DOS_SetError(DOSERR_WRITE_PROTECTED);
return false;
}
char newdir[CROSS_LEN];
strcpy(newdir,basedir);
strcat(newdir,dir);
@ -731,6 +757,7 @@ bool localDrive::MakeDir(const char * dir) {
host_cnv_char_t *host_name = CodePageGuestToHost(temp_name);
if (host_name == NULL) {
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,newdir);
DOS_SetError(DOSERR_FILE_NOT_FOUND); // FIXME
return false;
}
@ -745,6 +772,11 @@ bool localDrive::MakeDir(const char * dir) {
}
bool localDrive::RemoveDir(const char * dir) {
if (readonly) {
DOS_SetError(DOSERR_WRITE_PROTECTED);
return false;
}
char newdir[CROSS_LEN];
strcpy(newdir,basedir);
strcat(newdir,dir);
@ -756,6 +788,7 @@ bool localDrive::RemoveDir(const char * dir) {
host_cnv_char_t *host_name = CodePageGuestToHost(temp_name);
if (host_name == NULL) {
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,newdir);
DOS_SetError(DOSERR_FILE_NOT_FOUND);
return false;
}
@ -795,6 +828,11 @@ bool localDrive::TestDir(const char * dir) {
}
bool localDrive::Rename(const char * oldname,const char * newname) {
if (readonly) {
DOS_SetError(DOSERR_WRITE_PROTECTED);
return false;
}
host_cnv_char_t *ht;
char newold[CROSS_LEN];
@ -813,6 +851,7 @@ bool localDrive::Rename(const char * oldname,const char * newname) {
ht = CodePageGuestToHost(newold);
if (ht == NULL) {
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,newold);
DOS_SetError(DOSERR_FILE_NOT_FOUND);
return false;
}
host_cnv_char_t *o_temp_name = ht_strdup(ht);
@ -822,6 +861,7 @@ bool localDrive::Rename(const char * oldname,const char * newname) {
if (ht == NULL) {
free(o_temp_name);
LOG_MSG("%s: Filename '%s' from guest is non-representable on the host filesystem through code page conversion",__FUNCTION__,newnew);
DOS_SetError(DOSERR_FILE_NOT_FOUND); // FIXME
return false;
}
host_cnv_char_t *n_temp_name = ht_strdup(ht);

1
src/dos/drives.cpp
View File

@ -111,6 +111,7 @@ void Set_Label(char const * const input, char * const output, bool cdrom) {
DOS_Drive::DOS_Drive() {
readonly=false;
curdir[0]=0;
info[0]=0;
}