Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

In a 'Bad command or filename' error, print the name of the non-existent program, so getting the error from a batch file isn't so mysterious.

Browse source 
svn path=/trunk/; revision=39998
This commit is contained in:
Jeffrey Morlan 2009-03-13 01:26:08 +00:00
parent 40329ba147
commit 4ef352817a
18 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/shell/cmd/cmd.c
View file

@ -453,7 +453,7 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
/* search the PATH environment variable for the binary */
if (!SearchForExecutable (first, szFullName))
{
error_bad_command ();
error_bad_command (first);
cmd_free (first);
cmd_free (rest);
cmd_free (full);
@ -531,7 +531,7 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
if (!RunFile(full))
{
TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(full));
error_bad_command ();
error_bad_command (first);
nErrorLevel = 1;
}
else

2
reactos/base/shell/cmd/cmd.h
View file

@ -214,7 +214,7 @@ INT CommandEchoserr (LPTSTR);
VOID ErrorMessage (DWORD, LPTSTR, ...);
VOID error_no_pipe (VOID);
VOID error_bad_command (VOID);
VOID error_bad_command (LPTSTR);
VOID error_invalid_drive (VOID);
VOID error_req_param_missing (VOID);
VOID error_sfile_not_found (LPTSTR);

4
reactos/base/shell/cmd/error.c
View file

@ -118,9 +118,9 @@ VOID error_invalid_drive (VOID)
}
VOID error_bad_command (VOID)
VOID error_bad_command (LPTSTR s)
{
ConErrResPuts(STRING_ERROR_BADCOMMAND);
ConErrResPrintf(STRING_ERROR_BADCOMMAND, s);
nErrorLevel = 9009;
}

2
reactos/base/shell/cmd/for.c
View file

@ -268,7 +268,7 @@ static BOOL ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer)
InputFile = _tpopen(Start + 1, _T("r"));
if (!InputFile)
{
error_bad_command();
error_bad_command(Start + 1);
return FALSE;
}
FullInput = ReadFileContents(InputFile, Buffer);

2
reactos/base/shell/cmd/lang/de-DE.rc
View file

@ -650,7 +650,7 @@ STRING_ERROR_FILE_NOT_FOUND, "Datei wurde nicht gefunden\n"
STRING_ERROR_REQ_PARAM_MISSING, "Benötigter Parameter fehlt\n"
STRING_ERROR_INVALID_DRIVE, "Ungültige Laufwerksangaben\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Ungültiges Parameterformat - %s\n"
STRING_ERROR_BADCOMMAND, "Ungültiger Befehl oder Dateiname\n"
STRING_ERROR_BADCOMMAND, "Ungültiger Befehl oder Dateiname - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Fehler: Zu wenig Speicher verfügbar.\n"
STRING_ERROR_CANNOTPIPE, "Fehler: Cannot pipe! Temporäre Datei kann nicht geöffnet werden!\n"
STRING_ERROR_D_PAUSEMSG, "Drücken Sie eine beliebige Taste . . ."

2
reactos/base/shell/cmd/lang/el-GR.rc
View file

@ -664,7 +664,7 @@ STRING_ERROR_FILE_NOT_FOUND, "
STRING_ERROR_REQ_PARAM_MISSING, "Ëåßðåé áðáñáßôçôç ðáñÜìåôñïò\n"
STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Ìç Ýãêõñï öïñìÜ ðáñáìÝôñïõ - %s\n"
STRING_ERROR_BADCOMMAND, "ÅóöáëìÝíç åíôïëÞ Þ üíïìá\n"
STRING_ERROR_BADCOMMAND, "ÅóöáëìÝíç åíôïëÞ Þ üíïìá - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n"
STRING_ERROR_CANNOTPIPE, "ÓöÜëìá! Cannot pipe! Cannot open temporary file!\n"
STRING_ERROR_D_PAUSEMSG, "ÐáôÞóôå ïðïéïäÞðïôå ðëÞêôñï ãéá óõíÝ÷åéá . . ."

2
reactos/base/shell/cmd/lang/en-US.rc
View file

@ -669,7 +669,7 @@ STRING_ERROR_FILE_NOT_FOUND, "File not found\n"
STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n"
STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n"
STRING_ERROR_BADCOMMAND, "Bad command or filename\n"
STRING_ERROR_BADCOMMAND, "Bad command or filename - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n"
STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n"
STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ."

2
reactos/base/shell/cmd/lang/es-ES.rc
View file

@ -624,7 +624,7 @@ STRING_ERROR_FILE_NOT_FOUND, "Archivo no encontrado\n"
STRING_ERROR_REQ_PARAM_MISSING, "Prámetro requerido no encontrado\n"
STRING_ERROR_INVALID_DRIVE, "Especificación de unidad errónea\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Formato de parámetro erróneo - %s\n"
STRING_ERROR_BADCOMMAND, "Comando o nombre de archivo erróneo\n"
STRING_ERROR_BADCOMMAND, "Comando o nombre de archivo erróneo - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Error fuera de memoria.\n"
STRING_ERROR_CANNOTPIPE, "¡Error! ¡No se puede apilar! ¡No se puede abrir el archivo temporal!\n"
STRING_ERROR_D_PAUSEMSG, "Pulsa una tecla para continuar . . ."

2
reactos/base/shell/cmd/lang/fr-FR.rc
View file

@ -682,7 +682,7 @@ STRING_ERROR_FILE_NOT_FOUND, "Fichier non trouv
STRING_ERROR_REQ_PARAM_MISSING, "Paramètre requis manquant\n"
STRING_ERROR_INVALID_DRIVE, "Lecteur spécifié introuvable\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Format de paramètre incorrect - %s\n"
STRING_ERROR_BADCOMMAND, "Commande ou nom de fichier inconnu\n"
STRING_ERROR_BADCOMMAND, "Commande ou nom de fichier inconnu - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Pas assez de mémoire.\n"
STRING_ERROR_CANNOTPIPE, "Erreur ! Impossible de chaîner ! Échec à l'ouverture du fichier temporaire!\n"
STRING_ERROR_D_PAUSEMSG, "Appuyez sur une touche pour continuer . . ."

2
reactos/base/shell/cmd/lang/hu-HU.rc
View file

@ -604,7 +604,7 @@ STRING_ERROR_FILE_NOT_FOUND, "Az
STRING_ERROR_REQ_PARAM_MISSING, "Egy szükséges paraméter hiányzik\n"
STRING_ERROR_INVALID_DRIVE, "Érvénytelen meghajtó\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Érvénytelen paraméter megadás - %s\n"
STRING_ERROR_BADCOMMAND, "Ismeretlen parancs vagy állomány név\n"
STRING_ERROR_BADCOMMAND, "Ismeretlen parancs vagy állomány név - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Nincs elég memória.\n"
STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary állomány!\n"
STRING_ERROR_D_PAUSEMSG, "A folytatáshoz nyomj meg egy billentyût . . ."

2
reactos/base/shell/cmd/lang/id-ID.rc
View file

@ -626,7 +626,7 @@ STRING_ERROR_FILE_NOT_FOUND, "File tidak ditemukan\n"
STRING_ERROR_REQ_PARAM_MISSING, "Parameter yang diperlukan kurang\n"
STRING_ERROR_INVALID_DRIVE, "Spesifikasi drive tidak benar\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Format parameter tidak benar - %s\n"
STRING_ERROR_BADCOMMAND, "Perintah atau nama file salah\n"
STRING_ERROR_BADCOMMAND, "Perintah atau nama file salah - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Kesalahan kekurangan memori.\n"
STRING_ERROR_CANNOTPIPE, "Salah! Tidak bisa melakukan pipe! Tidak bisa membuka file temporal!\n"
STRING_ERROR_D_PAUSEMSG, "Tekan tombol untuk melanjutkan . . ."

2
reactos/base/shell/cmd/lang/it-IT.rc
View file

@ -672,7 +672,7 @@ STRING_ERROR_FILE_NOT_FOUND, "File non trovato\n"
STRING_ERROR_REQ_PARAM_MISSING, "Parametro obbligatorio mancante\n"
STRING_ERROR_INVALID_DRIVE, "Disco non valido\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Formato dei parametri non valido - %s\n"
STRING_ERROR_BADCOMMAND, "Comando o nome di file errato\n"
STRING_ERROR_BADCOMMAND, "Comando o nome di file errato - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Errore di memoria esaurita.\n"
STRING_ERROR_CANNOTPIPE, "Errore! Impossibile ridirigere! Impossibile aprire un file temporaneo!\n"
STRING_ERROR_D_PAUSEMSG, "Premi un tasto per continuare . . ."

2
reactos/base/shell/cmd/lang/ja-JP.rc
View file

@ -633,7 +633,7 @@ STRING_ERROR_FILE_NOT_FOUND, "
STRING_ERROR_REQ_PARAM_MISSING, "必要なパラメータが不足しています。\n"
STRING_ERROR_INVALID_DRIVE, "無効なドライブ指定です。\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "無効なパラメータの書式です。 - %s\n"
STRING_ERROR_BADCOMMAND, "コマンドまたはファイル名が間違っています。\n"
STRING_ERROR_BADCOMMAND, "コマンドまたはファイル名が間違っています。 - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "メモリ不足エラー。\n"
STRING_ERROR_CANNOTPIPE, "エラー! パイプできません! 一時ファイルを開けません!\n"
STRING_ERROR_D_PAUSEMSG, "続行するには何かキーを押してください . . ."

2
reactos/base/shell/cmd/lang/no-NO.rc
View file

@ -618,7 +618,7 @@ STRING_ERROR_FILE_NOT_FOUND, "Filen ble ikke funnet\n"
STRING_ERROR_REQ_PARAM_MISSING, "Obligatorisk parameter mangler\n"
STRING_ERROR_INVALID_DRIVE, "Ugyldig stasjon angitt\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Ugyldig parameter format - %s\n"
STRING_ERROR_BADCOMMAND, "Feil kommando eller filnavn\n"
STRING_ERROR_BADCOMMAND, "Feil kommando eller filnavn - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Feil: Minne fullt.\n"
STRING_ERROR_CANNOTPIPE, "Feil! Kan ikke bruke datakanal! Kan ikke åpne midlertidig fil!\n"
STRING_ERROR_D_PAUSEMSG, "Trykk en tast for å fortsette . . ."

2
reactos/base/shell/cmd/lang/pl-PL.rc
View file

@ -624,7 +624,7 @@ STRING_ERROR_FILE_NOT_FOUND, "Plik nie zosta
STRING_ERROR_REQ_PARAM_MISSING, "Brak wymaganego parametru\n"
STRING_ERROR_INVALID_DRIVE, "Nieprawid³owe okreœlenie napêdu\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Niew³aœciwy format parametru - %s\n"
STRING_ERROR_BADCOMMAND, "Nieprawid這wa komenda lub nazwa pliku\n"
STRING_ERROR_BADCOMMAND, "Nieprawid這wa komenda lub nazwa pliku - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "B³¹d - brak pamiêci.\n"
STRING_ERROR_CANNOTPIPE, "B³¹d potoków! Nie mo¿na otworzyæ pliku tymczasowego.\n"
STRING_ERROR_D_PAUSEMSG, "Naciœnij dowolny klawisz, aby kontynuowaæ . . ."

2
reactos/base/shell/cmd/lang/ru-RU.rc
View file

@ -631,7 +631,7 @@ STRING_ERROR_FILE_NOT_FOUND, "
STRING_ERROR_REQ_PARAM_MISSING, "Îòñóòñòâóåò íåîáõîäèìûé ïàðàìåòð\n"
STRING_ERROR_INVALID_DRIVE, "Îøèáî÷íîå îïðåäåëåíèå äèñêà\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Îøèáî÷íûé ôîðìàò ïàðàìåòðà - %s\n"
STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè íåâåðíîå èìÿ ôàéëà\n"
STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè íåâåðíîå èìÿ ôàéëà - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Íåõâàòêà ïàìÿòè.\n"
STRING_ERROR_CANNOTPIPE, "Îøèáêà! Íåâîçìîæíî èñïîëüçîâàòü pipe! Íåâîçìîæíî ñîçäàòü âðåìåííûé ôàéë!\n"
STRING_ERROR_D_PAUSEMSG, "Äëÿ ïðîäîëæåíèÿ íàæìèòå ëþáóþ êëàâèøó . . ."

2
reactos/base/shell/cmd/lang/uk-UA.rc
View file

@ -672,7 +672,7 @@ STRING_ERROR_FILE_NOT_FOUND, "
STRING_ERROR_REQ_PARAM_MISSING, "³äñóòí³é îáîâ'ÿçêîâèé ïàðàìåòð\n"
STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n"
STRING_ERROR_BADCOMMAND, "Íåâ³ðíà êîìàíäà àáî ³ì'ÿ ôàéëó\n"
STRING_ERROR_BADCOMMAND, "Íåâ³ðíà êîìàíäà àáî ³ì'ÿ ôàéëó - %s\n"
STRING_ERROR_OUT_OF_MEMORY, "Íåäîñòàòíüî ïàì'ÿò³.\n"
STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n"
STRING_ERROR_D_PAUSEMSG, "Íàòèñí³òü áóäü-ÿêó êëàâ³øó äëÿ ïðîäîâæåííÿ . . ."

2
reactos/base/shell/cmd/start.c
View file

@ -214,7 +214,7 @@ INT cmd_start (LPTSTR Rest)
/* search the PATH environment variable for the binary */
if (!SearchForExecutable (rest, szFullName))
{
error_bad_command ();
error_bad_command(rest);
cmd_free(comspec);
return 1;