Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-28 01:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixing bug copy file c: by Brandon Turner

Browse source 
svn path=/trunk/; revision=16654
This commit is contained in:
Magnus Olsen 2005-07-19 23:44:22 +00:00
parent f48a391bbd
commit 3de4927bd6
1 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ enum
COPY_ASCII = 0x001, /* /A */ COPY_ASCII = 0x001, /* /A */
COPY_DECRYPT = 0x004, /* /D */ COPY_DECRYPT = 0x004, /* /D */
COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */ COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */
COPY_SHORTNAME = 0x010, /* /N : Not Impleneted */ COPY_SHORTNAME = 0x010, /* /N : Dummy, Never will be Impleneted */
COPY_NO_PROMPT = 0x020, /* /Y */ COPY_NO_PROMPT = 0x020, /* /Y */
COPY_PROMPT = 0x040, /* /-Y */ COPY_PROMPT = 0x040, /* /-Y */
COPY_RESTART = 0x080, /* /Z */ COPY_RESTART = 0x080, /* /Z */
@ -526,15 +526,9 @@ INT cmd_copy (LPTSTR cmd, LPTSTR param)
/* Set up the string that is the path to the destination */ /* Set up the string that is the path to the destination */
if(nDes != -1) if(nDes != -1)
{ {
/* Check to make sure if they entered c:, if they do then GFPN if(_tcslen(arg[nDes]) == 2 && arg[nDes][1] == _T(':'))
return current directory even though msdn says it will return c:\ */
if(_tcslen(arg[nDes]) == 2)
{ {
if(arg[nDes][1] == _T(':')) GetRootPath(arg[nDes],szDestPath,MAX_PATH);
{
_tcscpy (szDestPath, arg[nDes]);
_tcscat (szDestPath, _T("\\"));
}
} }
else else
/* If the user entered two file names then form the full string path*/ /* If the user entered two file names then form the full string path*/
@ -552,7 +546,6 @@ INT cmd_copy (LPTSTR cmd, LPTSTR param)
/* Get the full string of the path to the source file*/ /* Get the full string of the path to the source file*/
if(_tcschr (arg[nSrc], _T('+')) != NULL) if(_tcschr (arg[nSrc], _T('+')) != NULL)
{ {
_tcscpy(tmpName,_T("\0")); _tcscpy(tmpName,_T("\0"));
/* Loop through the source file name and copy all /* Loop through the source file name and copy all
the chars one at a time until it gets too + */ the chars one at a time until it gets too + */
@ -572,14 +565,13 @@ INT cmd_copy (LPTSTR cmd, LPTSTR param)
} }
/* Finish the string off with a null char */ /* Finish the string off with a null char */
_tcsncat(tmpName,_T("\0"),1); _tcsncat(tmpName,_T("\0"),1);
/* Check to make sure if they entered c:, if they do then GFPN
return current directory even though msdn says it will return c:\ */
if(_tcslen(tmpName) == 2) if(_tcslen(tmpName) == 2)
{ {
if(tmpName[1] == _T(':')) if(tmpName[1] == _T(':'))
{ {
_tcscpy (szSrcPath, tmpName);
_tcscat (szSrcPath, _T("\\")); GetRootPath(tmpName,szSrcPath,MAX_PATH);
} }
} }
else else
@ -588,15 +580,9 @@ INT cmd_copy (LPTSTR cmd, LPTSTR param)
} }
else else
{ {
/* Check to make sure if they entered c:, if they do then GFPN if(_tcslen(arg[nSrc]) == 2 && arg[nSrc][1] == _T(':'))
return current directory even though msdn says it will return c:\ */
if(_tcslen(arg[nSrc]) == 2)
{ {
if(arg[nSrc][1] == _T(':')) GetRootPath(arg[nSrc],szSrcPath,MAX_PATH);
{
_tcscpy (szSrcPath, arg[nSrc]);
_tcscat (szSrcPath, _T("\\"));
}
} }
else else
/* Get the full path of the source file */ /* Get the full path of the source file */