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

make mount accept ~ for home

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2321
This commit is contained in:
Peter Veenstra 2005-09-27 12:50:54 +00:00
parent 417fb048ba
commit 96445503b6
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dos/dos_programs.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dos_programs.cpp,v 1.41 2005-08-24 21:12:24 qbix79 Exp $ */
/* $Id: dos_programs.cpp,v 1.42 2005-09-27 12:50:54 qbix79 Exp $ */
#include <stdlib.h>
#include <string.h>
@ -141,12 +141,25 @@ public:
if (!cmd->FindCommand(2,temp_line)) goto showusage;
if (!temp_line.size()) goto showusage;
struct stat test;
//Win32 : strip tailing backslashes
//rest: substiture ~ for home
#if defined (WIN32)
/* Removing trailing backslash if not root dir so stat will succeed */
if(temp_line.size() > 3 && temp_line[temp_line.size()-1]=='\\') temp_line.erase(temp_line.size()-1,1);
#endif
struct stat test;
if (stat(temp_line.c_str(),&test)) {
#else
bool failed = false;
if (stat(temp_line.c_str(),&test)) {
failed = true;
if(temp_line.size() && temp_line[0] == '~') {
char * home = getenv("HOME");
if(home) temp_line.replace(0,1,std::string(home));
if(!stat(temp_line.c_str(),&test)) failed = false;
}
}
if(failed) {
#endif
WriteOut(MSG_Get("PROGRAM_MOUNT_ERROR_1"),temp_line.c_str());
return;
}