programs/wcmd: Rename to programs/cmd.

This commit is contained in:
Dan Kegel 2006-09-03 21:13:08 -07:00 committed by Alexandre Julliard
parent 4f28f7967d
commit 39857443e4
30 changed files with 41 additions and 44 deletions

4
configure vendored

File diff suppressed because one or more lines are too long

View File

@ -1756,6 +1756,7 @@ libs/wpp/Makefile
loader/Makefile
programs/Makefile
programs/clock/Makefile
programs/cmd/Makefile
programs/cmdlgtst/Makefile
programs/control/Makefile
programs/eject/Makefile
@ -1776,7 +1777,6 @@ programs/start/Makefile
programs/taskmgr/Makefile
programs/uninstaller/Makefile
programs/view/Makefile
programs/wcmd/Makefile
programs/wineboot/Makefile
programs/winebrowser/Makefile
programs/winecfg/Makefile

View File

@ -531,7 +531,7 @@ MSVCRT_intptr_t CDECL _spawnvp(int flags, const char* name, const char* const* a
*/
MSVCRT_FILE* CDECL MSVCRT__popen(const char* command, const char* mode)
{
static const char wcmd[] = "wcmd", cmdFlag[] = " /C ", comSpec[] = "COMSPEC";
static const char wcmd[] = "cmd", cmdFlag[] = " /C ", comSpec[] = "COMSPEC";
MSVCRT_FILE *ret;
BOOL readPipe = TRUE;
int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fdStdErr = -1;

View File

@ -197,6 +197,7 @@ WINE COMPONENTS
~~~~~~~~~~~~~~~
* Executable Files
- cmd : Wine's command line interpreter, a cmd.exe replacement.
- notepad : The windows Notepad replacement.
- progman : A Program Manager replacement.
- regedit : A graphical tool to edit your registry or for
@ -207,7 +208,6 @@ WINE COMPONENTS
managing running Windows and Winlib processes.
- uninstaller: A program to uninstall installed Windows programs.
Like the Add/Remove Program in the windows control panel.
- wcmd : Wine's command line interpreter, a cmd.exe replacement.
- widl : Wine IDL compiler compiles (MS-RPC and DCOM) Interface
Definition Language files.
- wine : The main Wine executable. This program will load a Windows
@ -454,7 +454,6 @@ You will need to package the files:
$prefix/bin/regedit
$prefix/bin/rundll32
$prefix/bin/regsvr32
$prefix/bin/wcmd
$prefix/bin/widl
$prefix/bin/winhelp

2
programs/.gitignore vendored
View File

@ -3,6 +3,7 @@
/wineapploader
/winelauncher
clock/clock
cmd/cmd
cmdlgtst/cmdlgtst
control/control
eject/eject
@ -23,7 +24,6 @@ start/start
taskmgr/taskmgr
uninstaller/uninstaller
view/view
wcmd/wcmd
wineboot/wineboot
winebrowser/winebrowser
winecfg/winecfg

View File

@ -7,6 +7,7 @@ VPATH = @srcdir@
SUBDIRS = \
clock \
cmd \
cmdlgtst \
control \
eject \
@ -27,7 +28,6 @@ SUBDIRS = \
taskmgr \
uninstaller \
view \
wcmd \
wineboot \
winebrowser \
winecfg \
@ -46,6 +46,7 @@ SUBDIRS = \
# Sub-directories to run make install into
INSTALLSUBDIRS = \
clock \
cmd \
control \
eject \
expand \
@ -64,7 +65,6 @@ INSTALLSUBDIRS = \
start \
taskmgr \
uninstaller \
wcmd \
wineboot \
winebrowser \
winecfg \
@ -87,7 +87,6 @@ INSTALLPROGS = \
regedit \
regsvr32 \
uninstaller \
wcmd \
wineboot \
winebrowser \
winecfg \

View File

@ -62,7 +62,7 @@ preceding it with an @ sign.\n"
Syntax: FOR %variable IN (set) DO command\n\
\n\
The requirement to double the % sign when using FOR in a batch file does\n\
not exist in wcmd.\n"
not exist in wine's cmd.\n"
WCMD_GOTO,
"The GOTO command transfers execution to another statement within a\n\
@ -105,7 +105,7 @@ below the item are moved as well.\n\
MOVE fails if the old and new locations are on different DOS drive letters.\n"
WCMD_PATH,
"PATH displays or changes the wcmd search path.\n\
"PATH displays or changes the cmd search path.\n\
\n\
Entering PATH will display the current PATH setting (initially this is\n\
the value given in your wine.conf file). To change the setting follow the\n\
@ -125,14 +125,14 @@ before it scrolls off the screen.\n"
"PROMPT sets the command-line prompt.\n\
\n\
The string following the PROMPT command (and the space immediately after)\n\
appears at the beginning of the line when wcmd is waiting for input.\n\
appears at the beginning of the line when cmd is waiting for input.\n\
\n\
The following character strings have the special meaning shown:\n\
\n\
$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n\
$d Current date $e Escape $g > sign\n\
$l < sign $n Current drive $p Current path\n\
$q Equal sign $t Current time $v wcmd version\n\
$q Equal sign $t Current time $v cmd version\n\
\n\
Note that entering the PROMPT command without a prompt-string resets the\n\
prompt to the default, which is the current directory (which includes the\n\
@ -152,7 +152,7 @@ action, and can therefore be used as a comment in a batch file.\n"
WCMD_RMDIR, "Help about RMDIR\n"
WCMD_SET,
"SET displays or changes the wcmd environment variables.\n\
"SET displays or changes the cmd environment variables.\n\
\n\
SET without parameters shows all of the current environment.\n\
\n\
@ -167,7 +167,7 @@ have embedded spaces.\n\
Under Wine, the environment of the underlying operating system is\n\
included into the Win32 environment, there will generally therefore be\n\
many more values than in a native Win32 implementation. Note that it is\n\
not possible to affect the operating system environment from within wcmd.\n"
not possible to affect the operating system environment from within cmd.\n"
WCMD_SHIFT,
"SHIFT is used in a batch file to remove one parameter from the head of\n\
@ -176,7 +176,7 @@ if called from the command line.\n"
WCMD_TIME, "Help about TIME\n"
WCMD_TITLE, "Sets the window title for the wcmd window, syntax TITLE [string]\n"
WCMD_TITLE, "Sets the window title for the cmd window, syntax TITLE [string]\n"
WCMD_TYPE,
"TYPE <filename> copies <filename> to the console device (or elsewhere\n\
@ -192,15 +192,15 @@ VERIFY Displays ON or OFF as appropriate.\n\
The verify flag has no function in Wine.\n"
WCMD_VER,
"VER displays the version of wcmd you are running\n"
"VER displays the version of cmd you are running\n"
WCMD_VOL, "Help about VOL\n"
WCMD_EXIT,
"EXIT terminates the current command session and returns\n\
to the operating system or shell from which you invoked wcmd.\n"
to the operating system or shell from which you invoked cmd.\n"
1000, "WCMD built-in commands are:\n\
1000, "CMD built-in commands are:\n\
ATTRIB\t\tShow or change DOS file attributes\n\
CALL\t\tInvoke a batch file from inside another\n\
CD (CHDIR)\tChange current default directory\n\
@ -220,10 +220,10 @@ REN (RENAME)\tRename a file\n\
RD (RMDIR)\tDelete a subdirectory\n\
SET\t\tSet or show environment variables\n\
TIME\t\tSet or show the current system time\n\
TITLE\t\tSet the window title for the WCMD session\n\
TITLE\t\tSet the window title for the CMD session\n\
TYPE\t\tType the contents of a text file\n\
VER\t\tShow the current version of WCMD\n\
VER\t\tShow the current version of CMD\n\
VOL\t\tShow the volume label of a disk device\n\
EXIT\t\tClose down WCMD\n\n\
EXIT\t\tClose down CMD\n\n\
Enter HELP <command> for further information on any of the above commands\n"
}

View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wcmd.exe
MODULE = cmd.exe
APPMODE = -mconsole
IMPORTS = shell32 user32 kernel32

View File

@ -1,4 +1,4 @@
WCMD - A Command-Line Interface for WINE
CMD - A Command-Line Interface for WINE
Copyright (C) 1999 D Pickles (davep@nugate.demon.co.uk)
Open Source software published under the Wine Licence and Warranty.
@ -34,13 +34,13 @@ with an absolute or relative path but no wildcards or partial filenames.
- Redirection is implemented as a command line is parsed. This means that ">"
and "<" symbols cannot appear in command arguments even within quotes.
- In many cases parsing and syntax checking is less rigorous than DOS. Thus an
existing DOS batch file will probably run unchanged under Wcmd but the reverse
may not be the case.
existing DOS batch file will probably run unchanged under wine's cmd but the
reverse may not be the case.
WINE OR WIN32 BINARY?
Wcmd can be built as a Wine binary, or (using a Win32 compiler) as a Win32 .EXE
cmd can be built as a Wine binary, or (using a Win32 compiler) as a Win32 .EXE
image. The Wine binary is simpler to invoke from the U**x command line or from
a GUI such as KDE, however it is not possible to invoke a second shell using the
"WCMD /C filename" syntax. Conversely a Win32 application can be invoked from a
"CMD /C filename" syntax. Conversely a Win32 application can be invoked from a
Win32 GUI such as Program Manager but that needs starting under Wine first.

View File

@ -1,5 +1,5 @@
/*
* WCMD - Wine-compatible command line interface - batch interface.
* CMD - Wine-compatible command line interface - batch interface.
*
* Copyright (C) 1999 D A Pickles
*

View File

@ -1,5 +1,5 @@
/*
* WCMD - Wine-compatible command line interface - built-in functions.
* CMD - Wine-compatible command line interface - built-in functions.
*
* Copyright (C) 1999 D A Pickles
*

View File

@ -1,5 +1,5 @@
/*
* WCMD - Wine-compatible command line interface - Directory functions.
* CMD - Wine-compatible command line interface - Directory functions.
*
* Copyright (C) 1999 D A Pickles
*

View File

@ -1,5 +1,5 @@
/*
* WCMD - Wine-compatible command line interface.
* CMD - Wine-compatible command line interface.
*
* Copyright (C) 1999 D A Pickles
*

View File

@ -1,5 +1,5 @@
/*
* WCMD - Wine-compatible command line interface.
* CMD - Wine-compatible command line interface.
*
* Copyright (C) 1999 - 2001 D A Pickles
*
@ -40,7 +40,7 @@ int echo_mode = 1, verify_mode = 0;
static int opt_c, opt_k, opt_s;
const char nyi[] = "Not Yet Implemented\n\n";
const char newline[] = "\n";
const char version_string[] = "WCMD Version " PACKAGE_VERSION "\n\n";
const char version_string[] = "CMD Version " PACKAGE_VERSION "\n\n";
const char anykey[] = "Press Return key to continue: ";
char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
BATCH_CONTEXT *context = NULL;
@ -973,7 +973,7 @@ char *p;
char temp_path[MAX_PATH], temp_file[MAX_PATH], temp_file2[MAX_PATH], temp_cmd[1024];
GetTempPath (sizeof(temp_path), temp_path);
GetTempFileName (temp_path, "WCMD", 0, temp_file);
GetTempFileName (temp_path, "CMD", 0, temp_file);
p = strchr(command, '|');
*p++ = '\0';
wsprintf (temp_cmd, "%s > %s", command, temp_file);
@ -981,7 +981,7 @@ char temp_path[MAX_PATH], temp_file[MAX_PATH], temp_file2[MAX_PATH], temp_cmd[10
command = p;
while ((p = strchr(command, '|'))) {
*p++ = '\0';
GetTempFileName (temp_path, "WCMD", 0, temp_file2);
GetTempFileName (temp_path, "CMD", 0, temp_file2);
wsprintf (temp_cmd, "%s < %s > %s", command, temp_file, temp_file2);
WCMD_process_command (temp_cmd);
DeleteFile (temp_file);

View File

@ -33,7 +33,6 @@ my %bin_install =
"regedit" => 1,
"regsvr32" => 1,
"uninstaller" => 1,
"wcmd" => 1,
"wineboot" => 1,
"winebrowser" => 1,
"winecfg" => 1,
@ -72,13 +71,13 @@ sub update_file($)
if (! -f "configure.ac" && -f "../configure.ac") { chdir(".."); }
my @args = @ARGV;
if (!@args) { @args = split /\s/, `find programs -name Makefile.in -print`; }
if (!@args) { @args = map { s/^(.*)\.in/$1/; $_; } split(/\s/,`find programs -name Makefile.in -print`); }
foreach my $i (@args)
{
my $module;
open MAKE,$i;
open MAKE, "$i.in" or die "cannot open $i.in\n";
$module = undef;
while (<MAKE>)

View File

@ -226,7 +226,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc
HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll"
[Environment]
HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\wcmd.exe"
HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\cmd.exe"
HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",2,"%11%;%10%"
HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%"
HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%"
@ -2124,7 +2124,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,wintrust.dll,1
[FakeDllsSection]
11,,explorer.exe
10,,notepad.exe
10,,regedit.exe
10,,rundll32.exe
@ -2133,6 +2132,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
10,command,start.exe
11,,advapi32.dll
11,,advpack.dll
11,,cmd.exe
11,,comctl32.dll
11,,comdlg32.dll
11,,control.exe
@ -2140,6 +2140,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,d3d8.dll
11,,dbghelp.dll
11,,ddraw.dll
11,,explorer.exe
11,,gdi32.dll
11,,hhctrl.ocx
11,,imaadp32.acm
@ -2152,10 +2153,10 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,msvcrt.dll
11,,notepad.exe
11,,ntdll.dll
11,,opengl32.dll
11,,ole32.dll
11,,oleaut32.dll
11,,olepro32.dll
11,,opengl32.dll
11,,progman.exe
11,,regsvr32.exe
11,,riched20.dll
@ -2168,7 +2169,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,urlmon.dll
11,,user32.dll
11,,version.dll
11,,wcmd.exe
11,,wininet.dll
11,,winmm.dll
11,,winspool.drv