diff --git a/rosapps/cmd/cmd.c b/rosapps/cmd/cmd.c index 558e6d97adb..137f83bb432 100644 --- a/rosapps/cmd/cmd.c +++ b/rosapps/cmd/cmd.c @@ -1,4 +1,4 @@ -/* $Id: cmd.c,v 1.17 1999/12/15 00:50:41 ekohl Exp $ +/* $Id: cmd.c,v 1.18 1999/12/28 23:06:21 ekohl Exp $ * * CMD.C - command-line interface. * @@ -110,6 +110,9 @@ * * 15-Dec-1999 (Eric Kohl ) * Fixed current directory + * + * 28-Dec-1999 (Eric Kohl ) + * Restore window title after program/batch execution */ #include "config.h" @@ -167,6 +170,9 @@ static VOID Execute (LPTSTR first, LPTSTR rest) { TCHAR szFullName[MAX_PATH]; +#ifndef __REACTOS__ + TCHAR szWindowTitle[MAX_PATH]; +#endif DWORD dwExitCode = 0; #ifdef _DEBUG @@ -223,6 +229,10 @@ Execute (LPTSTR first, LPTSTR rest) return; } +#ifndef __REACTOS__ + GetConsoleTitle (szWindowTitle, MAX_PATH); +#endif + /* check if this is a .BAT or .CMD file */ if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) || !_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".cmd"))) @@ -301,6 +311,10 @@ Execute (LPTSTR first, LPTSTR rest) "Error executing CreateProcess()!!\n"); } } + +#ifndef __REACTOS__ + SetConsoleTitle (szWindowTitle); +#endif } diff --git a/rosapps/cmd/cmd.h b/rosapps/cmd/cmd.h index fdbb4107085..36ed7eec4a7 100644 --- a/rosapps/cmd/cmd.h +++ b/rosapps/cmd/cmd.h @@ -1,4 +1,4 @@ -/* $Id: cmd.h,v 1.17 1999/12/15 00:50:41 ekohl Exp $ +/* $Id: cmd.h,v 1.18 1999/12/28 23:06:35 ekohl Exp $ * * CMD.H - header file for the modules in CMD.EXE * @@ -113,7 +113,6 @@ INT cmd_cls (LPTSTR, LPTSTR); /* Prototypes for CMD.C */ -//void command(char *); VOID ParseCommandLine (LPTSTR); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); @@ -139,7 +138,6 @@ extern COMMAND cmds[]; /* The internal command table */ /* Prototypes for COLOR.C */ VOID SetScreenColor(WORD wArgColor, BOOL bFill); -//VOID SetScreenColor (WORD); INT CommandColor (LPTSTR, LPTSTR); @@ -153,10 +151,8 @@ VOID ConInDisable (VOID); VOID ConInEnable (VOID); VOID ConInFlush (VOID); VOID ConInKey (PINPUT_RECORD); - VOID ConInString (LPTSTR, DWORD); - VOID ConOutChar (TCHAR); VOID ConOutPuts (LPTSTR); VOID ConOutPrintf (LPTSTR, ...); diff --git a/rosapps/cmd/cmdver.h b/rosapps/cmd/cmdver.h index 8d7810cecf2..9b11b0f3d0e 100644 --- a/rosapps/cmd/cmdver.h +++ b/rosapps/cmd/cmdver.h @@ -1,2 +1,2 @@ -#define CMD_VER "0.1 pre 7" +#define CMD_VER "0.1" #define CMD_VER_RC CMD_VER"\0" diff --git a/rosapps/cmd/config.h b/rosapps/cmd/config.h index 36a8b970114..db75fd8031d 100644 --- a/rosapps/cmd/config.h +++ b/rosapps/cmd/config.h @@ -9,8 +9,8 @@ * */ -/* undefine only if used under ReactOS */ -//#define __REACTOS__ +/* Define only if used under ReactOS */ +#define __REACTOS__ #ifndef _CONFIG_H_INCLUDED_ #define _CONFIG_H_INCLUDED_ @@ -103,17 +103,4 @@ #define INCLUDE_CMD_WINDOW #endif -/* -commands that do not have a define: - -exit -call -echo -goto -for -if -shift - -*/ - #endif /* _CONFIG_H_INCLUDED_ */ diff --git a/rosapps/cmd/history.txt b/rosapps/cmd/history.txt index 687211ccc65..14a3ca9a705 100644 --- a/rosapps/cmd/history.txt +++ b/rosapps/cmd/history.txt @@ -344,8 +344,8 @@ o Added CHCP command. o Fixed keyboard input bug. o Rewrote DEL and MOVE commands. -01-Sep-1999 ReactOS CMD version 0.1 pre 7 (Eric Kohl ) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +28-Dec-1999 ReactOS CMD version 0.1 (Eric Kohl ) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ o Cleaned up DIR command. o Searching for executables in the right order. o Fixed some little but nasty bugs. @@ -355,4 +355,5 @@ o Added CHOICE, TIMER, FREE and MEMORY commands. o Added MSGBOX command (not available under ReactOS). o Added and fixed missing help texts. o Fixed bugs in MD and RD that crashed cmd when no directory was specified. - +o Improved history support. +o Improved COLOR command. diff --git a/rosapps/cmd/readme.txt b/rosapps/cmd/readme.txt index 26b7ae4cf2a..b72625e6c20 100644 --- a/rosapps/cmd/readme.txt +++ b/rosapps/cmd/readme.txt @@ -1,77 +1,42 @@ -ReactOS Command Line Interface "CMD" version 0.1 pre 2 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +ReactOS command line interpreter CMD version 0.1 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This is the fourth pre-alpha release of CMD.EXE for ReactOS. -It was converted from the FreeDOS COMMAND.COM. +The ReactOS command line interpreter CMD is derived from FreeCOM, the +FreeDOS command line interpreter. - -Warning!! Warning!! Warning!! -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This is an alpha version! Many features have not been tested! -Be careful when you use commands that write to your disk drives, -they might destroy your files or the file system!!! - - -Status -~~~~~~ -This is a converted version of FreeDOS COMMAND.COM. -I added some commands from WinNT's CMD.EXE. - - -New features and improvements -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Fixed redirection and piping. - (E.g. you can use "type > file" now.) - - Added new error redirections "2>" and "2>>". - (E.g.: "make 2>error.log") - - Added CHCP command. - - Fixed environment handling. - - New makefile for lcc-win (makefile.lcc). - - Rewrote DEL and MOVE with a new structure. - - Improved national language support. - - Fixed filename completion. +We are going for 4NT compatibility but try to stay compatible with +WinNT's CMD.EXE too. Compiling ~~~~~~~~~ -I converted CMD using MS Visual C++ 5.0 and Win95. The included makefile -is just an experimental version. +Cmd can be built in two different versions. A full version for use under +Windows 9x or Windows NT and a reduced version for use under ReactOS. -If you want to compile and test CMD with djgpp, modify the makefile as needed. -I put the CMD sources into [reactos\apps], the makefile is written for that -directory. +Note: The full version won't runder ReactOS and the reduced version is not +usable under Win 9x/NT. -If you want to compile and test CMD using another compiler, just create -a new console application project and add all *.c and *.h files to it. -It should compile without an error. +To build the full version, make sure the symbol '__REACTOS__' is NOT defined +in 'rosapps/cmd/config.h' line 13. + +To build the reduced version, make sure the symbol '__REACTOS__' is defined +in 'rosapps/cmd/config.h' line 13. -Please report bugs which are not listed above. +Current Features +~~~~~~~~~~~~~~~~ + + - environment handling with prompt and path support. + - directory utilities. + - command-line history with doskey-like features. + - batch file processing. + - input/output redirection and piping. + - alias support. + - filename completion (use TAB) -Good luck - - Eric Kohl - - - - -FreeDOS Command Line Interface -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -About -~~~~~ -This software is part of the FreeDOS project. Please email -freedos@sunsite.unc.edu for more information, or visit the freedos -archive at "ftp://sunsite.unc.edu/pub/micro/pc-stuff/freedos". Also, -visit our web page at http://www.freedos.org/. - -The command.com web site is at - - http://www.gcfl.net/FreeDOS/command.com/ - - -This software has been developed by the following people: -(listed in approximate chronological order of contributions) +Credits +~~~~~~~ FreeDOS developers: normat@rpi.edu (Tim Norman) @@ -88,14 +53,16 @@ FreeDOS developers: ReactOS developers: Eric Kohl + Emanuele Aliberti + Paolo Pantaleo -Current Features -~~~~~~~~~~~~~~~~ - - environment handling with prompt and path support. - - directory utilities. - - command-line history with doskey-like features. - - batch file processing. - - input/output redirection and piping. - - alias support. - - filename completion (use TAB) +Bugs +~~~~ + +Please report bugs to Eric Kohl . + + +Good luck + + Eric Kohl