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

Introduce mount -pr to mount paths relative to last loaded configuration file.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3911
This commit is contained in:
Peter Veenstra 2015-05-01 12:48:27 +00:00
parent f51d23bcab
commit 5a7b43f704
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dos/dos_programs.cpp
View file

@ -109,6 +109,8 @@ public:
WriteOut(MSG_Get("PROGRAM_CONFIG_SECURE_DISALLOW"));
return;
}
bool path_relative_to_last_config = false;
if (cmd->FindExist("-pr",true)) path_relative_to_last_config = true;
/* Check for unmounting */
if (cmd->FindString("-u",umount,false)) {
@ -245,10 +247,17 @@ public:
if (!cmd->FindCommand(2,temp_line)) goto showusage;
if (!temp_line.size()) goto showusage;
if(path_relative_to_last_config && control->configfiles.size() && !Cross::IsPathAbsolute(temp_line)) {
std::string lastconfigdir(control->configfiles[control->configfiles.size()-1]);
std::string::size_type pos = lastconfigdir.rfind(CROSS_FILESPLIT);
if(pos == std::string::npos) pos = 0; //No directory then erase string
lastconfigdir.erase(pos);
if (lastconfigdir.length()) temp_line = lastconfigdir + CROSS_FILESPLIT + temp_line;
}
struct stat test;
//Win32 : strip tailing backslashes
//os2: some special drive check
//rest: substiture ~ for home
//rest: substitute ~ for home
bool failed = false;
#if defined (WIN32) || defined(OS2)
/* Removing trailing backslash if not root dir so stat will succeed */