1
0
Fork 0

report typed entry for %0 not the parsed entry.(System Shock reported by ripsaw)

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3507
This commit is contained in:
Peter Veenstra 2009-11-30 14:53:00 +00:00
parent 8c94075781
commit f56fdefb31
3 changed files with 5 additions and 5 deletions

View file

@ -44,7 +44,7 @@ class DOS_Shell;
class BatchFile {
public:
BatchFile(DOS_Shell * host,char const* const name, char const * const cmd_line);
BatchFile(DOS_Shell * host,char const* const resolved_name,char const* const entered_name, char const * const cmd_line);
virtual ~BatchFile();
virtual bool ReadLine(char * line);
bool Goto(char * where);

View file

@ -24,14 +24,14 @@
#include "shell.h"
#include "support.h"
BatchFile::BatchFile(DOS_Shell * host,char const * const name, char const * const cmd_line) {
BatchFile::BatchFile(DOS_Shell * host,char const * const resolved_name,char const * const entered_name, char const * const cmd_line) {
location = 0;
prev=host->bf;
echo=host->echo;
shell=host;
char totalname[DOS_PATHLENGTH+4];
DOS_Canonicalize(name,totalname); // Get fullname including drive specificiation
cmd = new CommandLine(totalname,cmd_line);
DOS_Canonicalize(resolved_name,totalname); // Get fullname including drive specificiation
cmd = new CommandLine(entered_name,cmd_line);
filename = totalname;
//Test if file is openable

View file

@ -431,7 +431,7 @@ bool DOS_Shell::Execute(char * name,char * args) {
/* delete old batch file if call is not active*/
bool temp_echo=echo; /*keep the current echostate (as delete bf might change it )*/
if(bf && !call) delete bf;
bf=new BatchFile(this,fullname,line);
bf=new BatchFile(this,fullname,name,line);
echo=temp_echo; //restore it.
}
else