Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Display 'Drive not ready' error if the user tries to list the directory on an empty drive.

Browse source 
svn path=/trunk/; revision=6357
This commit is contained in:
Eric Kohl 2003-10-18 17:59:29 +00:00
parent ed9a0cb22a
commit 1de8f5d574
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $Id: dir.c,v 1.3 2003/08/07 09:27:42 hbirr Exp $ /* $Id: dir.c,v 1.4 2003/10/18 17:59:29 ekohl Exp $
* *
* DIR.C - dir internal command. * DIR.C - dir internal command.
* *
@ -381,7 +381,11 @@ DirParsePathspec (LPTSTR szPathspec, LPTSTR szPath, LPTSTR szFilespec)
szRootPath[0] = szPathspec[0]; szRootPath[0] = szPathspec[0];
start = szPathspec + 2; start = szPathspec + 2;
SetCurrentDirectory (szRootPath); if (!SetCurrentDirectory (szRootPath))
{
ErrorMessage (GetLastError(), NULL);
return 1;
}
} }
else else
{ {

16
reactos/subsys/system/cmd/error.c
View file

@ -51,9 +51,12 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
if (dwErrorCode == ERROR_SUCCESS) if (dwErrorCode == ERROR_SUCCESS)
return; return;
if (szFormat)
{
va_start (arg_ptr, szFormat); va_start (arg_ptr, szFormat);
_vstprintf (szMessage, szFormat, arg_ptr); _vstprintf (szMessage, szFormat, arg_ptr);
va_end (arg_ptr); va_end (arg_ptr);
}
#ifndef __REACTOS__ #ifndef __REACTOS__
@ -76,11 +79,15 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
switch (dwErrorCode) switch (dwErrorCode)
{ {
case ERROR_FILE_NOT_FOUND: case ERROR_FILE_NOT_FOUND:
szError = _T("File not found --"); szError = _T("File not found");
break; break;
case ERROR_PATH_NOT_FOUND: case ERROR_PATH_NOT_FOUND:
szError = _T("Path not found --"); szError = _T("Path not found");
break;
case ERROR_NOT_READY:
szError = _T("Drive not ready");
break; break;
default: default:
@ -88,7 +95,10 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
return; return;
} }
ConErrPrintf (_T("%s %s\n"), szError, szMessage); if (szFormat)
ConErrPrintf (_T("%s -- %s\n"), szError, szMessage);
else
ConErrPrintf (_T("%s\n"), szError);
#endif #endif
} }