a956f14de1
In an earlier change, I removed appending newline outside of batch mode in DOS shell code - that made DOSBox behave less like MS-DOS and more like modern shells, that do not try to compensate for buggy applications. However, we should recognize that DOSBox (unlike e.g. FreeDOS) is designed to run legacy applications, which might make assumptions about DOS implementation. Some examples: - PC Player Benchmark assumes, that help commands are displayed exactly at 80x25 terminal and formats the output to fill the whole screen (scrolling past DOS4GW messages). - Quake and other ID games print shareware information on exit, but do it via a direct memory dump (not interrupts to print DOS text), and follow up with setting cursor exactly at line 22 (which is partly written already), expecting shell to inject newline. - PCC Compiler prints status message on exit without newline, depending on MS-DOS shell behaviour. - TEXTUTIL set of external commands do not print nothing to standard output, and are designed to clear the screen, therefore writing a newline after .COM commands would be a mistake. Therefore we want to inject this newline, but not in every case. New implementation reuses a static variable used by Program base class (for purpose of translating UNIX newlines to DOS newlines) for detection if it's appropriate to inject an additional newline or not. Injecting the newline happens in function displaying the DOS prompt (so we don't need to write additonal logic for separately handling batch mode). When starting a non-COM, non-internal command the static variable is set to the state indicating that next DOS prompt should inject the newline. Fixes: #208
96 lines
3.1 KiB
C++
96 lines
3.1 KiB
C++
/*
|
|
* Copyright (C) 2002-2020 The DOSBox Team
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
|
|
#ifndef DOSBOX_PROGRAMS_H
|
|
#define DOSBOX_PROGRAMS_H
|
|
|
|
#ifndef DOSBOX_DOSBOX_H
|
|
#include "dosbox.h"
|
|
#endif
|
|
#ifndef DOSBOX_DOS_INC_H
|
|
#include "dos_inc.h"
|
|
#endif
|
|
|
|
#ifndef CH_LIST
|
|
#define CH_LIST
|
|
#include <list>
|
|
#endif
|
|
|
|
#ifndef CH_STRING
|
|
#define CH_STRING
|
|
#include <string>
|
|
#endif
|
|
|
|
class CommandLine {
|
|
public:
|
|
CommandLine(int argc,char const * const argv[]);
|
|
CommandLine(char const * const name,char const * const cmdline);
|
|
const char * GetFileName(){ return file_name.c_str();}
|
|
|
|
bool FindExist(char const * const name,bool remove=false);
|
|
bool FindHex(char const * const name,unsigned int & value,bool remove=false);
|
|
bool FindInt(char const * const name,int & value,bool remove=false);
|
|
bool FindString(char const * const name,std::string & value,bool remove=false);
|
|
bool FindCommand(unsigned int which,std::string & value);
|
|
bool FindStringBegin(char const * const begin,std::string & value, bool remove=false);
|
|
bool FindStringRemain(char const * const name,std::string & value);
|
|
bool FindStringRemainBegin(char const * const name,std::string & value);
|
|
bool GetStringRemain(std::string & value);
|
|
int GetParameterFromList(const char* const params[], std::vector<std::string> & output);
|
|
void FillVector(std::vector<std::string> & vector);
|
|
unsigned int GetCount(void);
|
|
void Shift(unsigned int amount=1);
|
|
Bit16u Get_arglength();
|
|
|
|
private:
|
|
typedef std::list<std::string>::iterator cmd_it;
|
|
std::list<std::string> cmds;
|
|
std::string file_name;
|
|
bool FindEntry(char const * const name,cmd_it & it,bool neednext=false);
|
|
};
|
|
|
|
class Program {
|
|
public:
|
|
Program();
|
|
Program(const Program&) = delete; // prevent copy
|
|
Program& operator=(const Program&) = delete; // prevent assignment
|
|
virtual ~Program(){
|
|
delete cmd;
|
|
delete psp;
|
|
}
|
|
std::string temp_line;
|
|
CommandLine * cmd;
|
|
DOS_PSP * psp;
|
|
virtual void Run(void)=0;
|
|
bool GetEnvStr(const char * entry,std::string & result);
|
|
bool GetEnvNum(Bitu num,std::string & result);
|
|
Bitu GetEnvCount(void);
|
|
bool SetEnv(const char * entry,const char * new_string);
|
|
void WriteOut(const char *format, ...); // printf to DOS stdout
|
|
void WriteOut_NoParsing(const char *str); // write string to DOS stdout
|
|
void InjectMissingNewline();
|
|
void ChangeToLongCmd();
|
|
|
|
static void ResetLastWrittenChar(char c);
|
|
};
|
|
|
|
typedef void (PROGRAMS_Main)(Program * * make);
|
|
void PROGRAMS_MakeFile(char const * const name,PROGRAMS_Main * main);
|
|
|
|
#endif
|