Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-08 13:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speed up compilation of cmd

Browse source 
svn path=/trunk/; revision=19678
This commit is contained in:
Casper Hornstrup 2005-11-27 11:59:02 +00:00
parent 9ef2cd74d6
commit c0133aeb66
7 changed files with 100 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
reactos/subsys/system/cmd/cmd.c
View file

@ -176,10 +176,45 @@ WORD wDefColor; /* default color */
#endif
/*
* is character a delimeter when used on first word?
* convert
*
* insert commas into a number
*/
INT
ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator)
{
TCHAR temp[32];
INT c = 0;
INT n = 0;
if (num.QuadPart == 0)
{
des[0] = _T('0');
des[1] = _T('\0');
n = 1;
}
else
{
temp[31] = 0;
while (num.QuadPart > 0)
{
if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator))
temp[30 - c++] = cThousandSeparator;
temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0');
num.QuadPart /= 10;
}
for (n = 0; n <= c; n++)
des[n] = temp[31 - c + n];
}
return n;
}
/*
* is character a delimeter when used on first word?
*
*/
static BOOL IsDelimiter (TCHAR c)
{
return (c == _T('/') || c == _T('=') || c == _T('\0') || _istspace (c));

1
reactos/subsys/system/cmd/cmd.h
View file

@ -93,6 +93,7 @@ INT cmd_cls (LPTSTR, LPTSTR);
/* Prototypes for CMD.C */
INT ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator);
VOID ParseCommandLine (LPTSTR);
LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName );
VOID AddBreakHandler (VOID);

108
reactos/subsys/system/cmd/cmd.xml
View file

@ -5,59 +5,61 @@
<define name="ANONYMOUSUNIONS" />
<define name="_WIN32_WINNT">0x0501</define>
<pch>precomp.h</pch>
<file>alias.c</file>
<file>attrib.c</file>
<file>batch.c</file>
<file>beep.c</file>
<file>call.c</file>
<file>chcp.c</file>
<file>choice.c</file>
<file>cls.c</file>
<file>cmd.c</file>
<file>cmdinput.c</file>
<file>cmdtable.c</file>
<file>color.c</file>
<file>console.c</file>
<file>copy.c</file>
<file>date.c</file>
<file>del.c</file>
<file>delay.c</file>
<file>dir.c</file>
<file>dirstack.c</file>
<file>echo.c</file>
<file>error.c</file>
<file>filecomp.c</file>
<file>for.c</file>
<file>free.c</file>
<file>goto.c</file>
<file>history.c</file>
<file>if.c</file>
<file>internal.c</file>
<file>label.c</file>
<file>locale.c</file>
<file>memory.c</file>
<file>misc.c</file>
<file>move.c</file>
<file>msgbox.c</file>
<file>path.c</file>
<file>pause.c</file>
<file>prompt.c</file>
<file>redir.c</file>
<file>ren.c</file>
<file>screen.c</file>
<file>set.c</file>
<file>shift.c</file>
<file>start.c</file>
<file>strtoclr.c</file>
<file>time.c</file>
<file>timer.c</file>
<file>title.c</file>
<file>type.c</file>
<file>ver.c</file>
<file>verify.c</file>
<file>vol.c</file>
<file>where.c</file>
<file>window.c</file>
<compilationunit name="unit.c">
<file>alias.c</file>
<file>attrib.c</file>
<file>batch.c</file>
<file>beep.c</file>
<file>call.c</file>
<file>chcp.c</file>
<file>choice.c</file>
<file>cls.c</file>
<file>cmd.c</file>
<file>cmdinput.c</file>
<file>cmdtable.c</file>
<file>color.c</file>
<file>console.c</file>
<file>copy.c</file>
<file>date.c</file>
<file>del.c</file>
<file>delay.c</file>
<file>dir.c</file>
<file>dirstack.c</file>
<file>echo.c</file>
<file>error.c</file>
<file>filecomp.c</file>
<file>for.c</file>
<file>free.c</file>
<file>goto.c</file>
<file>history.c</file>
<file>if.c</file>
<file>internal.c</file>
<file>label.c</file>
<file>locale.c</file>
<file>memory.c</file>
<file>misc.c</file>
<file>move.c</file>
<file>msgbox.c</file>
<file>path.c</file>
<file>pause.c</file>
<file>prompt.c</file>
<file>redir.c</file>
<file>ren.c</file>
<file>screen.c</file>
<file>set.c</file>
<file>shift.c</file>
<file>start.c</file>
<file>strtoclr.c</file>
<file>time.c</file>
<file>timer.c</file>
<file>title.c</file>
<file>type.c</file>
<file>ver.c</file>
<file>verify.c</file>
<file>vol.c</file>
<file>where.c</file>
<file>window.c</file>
</compilationunit>
</module>
<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" usewrc="false">
<include base="ReactOS">include/wine</include>

4
reactos/subsys/system/cmd/copy.c
View file

@ -324,7 +324,7 @@ copy (TCHAR source[MAX_PATH],
}
static INT Overwrite (LPTSTR fn)
static INT CopyOverwrite (LPTSTR fn)
{
/*ask the user if they want to override*/
TCHAR szMsg[RC_STRING_MAX_SIZE];
@ -844,7 +844,7 @@ INT cmd_copy (LPTSTR cmd, LPTSTR param)
/* Handle any overriding / prompting that needs to be done */
if(((!(dwFlags & COPY_NO_PROMPT) && IsExistingFile (tmpDestPath)) || dwFlags & COPY_PROMPT) && !bTouch)
nOverwrite = Overwrite(tmpDestPath);
nOverwrite = CopyOverwrite(tmpDestPath);
if(nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK)
continue;
if(nOverwrite == PROMPT_ALL || (nOverwrite == PROMPT_YES && bAppend))

32
reactos/subsys/system/cmd/dir.c
View file

@ -982,38 +982,6 @@ ConvertULong (ULONG num, LPTSTR des, INT len)
}
#endif
static INT
ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator)
{
TCHAR temp[32];
INT c = 0;
INT n = 0;
if (num.QuadPart == 0)
{
des[0] = _T('0');
des[1] = _T('\0');
n = 1;
}
else
{
temp[31] = 0;
while (num.QuadPart > 0)
{
if ((((c + 1) % (nNumberGroups + 1)) == 0) && (bPutSeperator))
temp[30 - c++] = cThousandSeparator;
temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0');
num.QuadPart /= 10;
}
for (n = 0; n <= c; n++)
des[n] = temp[31 - c + n];
}
return n;
}
static VOID
DirPrintFileDateTime(TCHAR *lpDate,
TCHAR *lpTime,

45
reactos/subsys/system/cmd/free.c
View file

@ -16,45 +16,6 @@
#ifdef INCLUDE_CMD_FREE
/*
* convert
*
* insert commas into a number
*/
static INT
ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len)
{
TCHAR temp[32];
INT c = 0;
INT n = 0;
if (num.QuadPart == 0)
{
des[0] = _T('0');
des[1] = _T('\0');
n = 1;
}
else
{
temp[31] = 0;
while (num.QuadPart > 0)
{
if (((c + 1) % (nNumberGroups + 1)) == 0)
temp[30 - c++] = cThousandSeparator;
temp[30 - c++] = (TCHAR)(num.QuadPart % 10) + _T('0');
num.QuadPart /= 10;
}
for (n = 0; n <= c; n++)
des[n] = temp[31 - c + n];
}
return n;
}
static VOID
PrintDiskInfo (LPTSTR szDisk)
{
@ -112,13 +73,13 @@ PrintDiskInfo (LPTSTR szDisk)
}
uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwTotCl;
ConvertULargeInteger (uliSize, szTotal, 40);
ConvertULargeInteger (uliSize, szTotal, 40, TRUE);
uliSize.QuadPart = dwSecPerCl * dwBytPerSec * (dwTotCl - dwFreeCl);
ConvertULargeInteger (uliSize, szUsed, 40);
ConvertULargeInteger (uliSize, szUsed, 40, TRUE);
uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwFreeCl;
ConvertULargeInteger (uliSize, szFree, 40);
ConvertULargeInteger (uliSize, szFree, 40, TRUE);
LoadString(CMD_ModuleHandle, STRING_FREE_HELP1, szMsg, RC_STRING_MAX_SIZE);

4
reactos/subsys/system/cmd/move.c
View file

@ -53,7 +53,7 @@ enum
MOVE_PATHS_ON_DIF_VOL = 0x080 /* source and destination paths are on different volume */
};
static INT Overwrite (LPTSTR fn)
static INT MoveOverwrite (LPTSTR fn)
{
/*ask the user if they want to override*/
TCHAR szMsg[RC_STRING_MAX_SIZE];
@ -412,7 +412,7 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
continue;
if(!(dwFlags & MOVE_OVER_YES) &&
(dwMoveStatusFlags & MOVE_DEST_EXISTS))
nOverwrite = Overwrite (szFullDestPath);
nOverwrite = MoveOverwrite (szFullDestPath);
if (nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK)
continue;
if (nOverwrite == PROMPT_ALL)