Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 29/48: [CMD] Improve the way the ErrorMessage() helper and the MKDIR and RMDIR commands report their errors.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5830ccb85ee4083d7f0f0… commit 5830ccb85ee4083d7f0f0c482e5420a33993fc0c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 1 02:39:25 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:05 2020 +0200 [CMD] Improve the way the ErrorMessage() helper and the MKDIR and RMDIR commands report their errors. For MKDIR, also properly support the case of ERROR_FILE_EXISTS and ERROR_ALREADY_EXISTS last-errors by displaying the standard error "A subdirectory or file XXX already exists.\n" --- base/shell/cmd/error.c | 2 +- base/shell/cmd/internal.c | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/base/shell/cmd/error.c b/base/shell/cmd/error.c index 193f785caca..be422f33cf4 100644 --- a/base/shell/cmd/error.c +++ b/base/shell/cmd/error.c @@ -50,7 +50,7 @@ ErrorMessage( NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&szError, 0, NULL)) { - ConErrPrintf(_T("%s %s\n"), szError, szMessage); + ConErrPrintf(_T("%s%s%s"), szError, szMessage, (*szMessage ? _T("\n") : _T(""))); if (szError) LocalFree(szError); return; diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 8798eecdd31..95416b4278b 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -327,6 +327,8 @@ INT cmd_mkdir (LPTSTR param) { LPTSTR *p; INT argc, i; + DWORD dwLastError; + if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_MKDIR_HELP); @@ -347,13 +349,20 @@ INT cmd_mkdir (LPTSTR param) { if (!MakeFullPath(p[i])) { - if (GetLastError() == ERROR_PATH_NOT_FOUND) + dwLastError = GetLastError(); + switch (dwLastError) { + case ERROR_PATH_NOT_FOUND: ConErrResPuts(STRING_MD_ERROR2); - } - else - { - ErrorMessage (GetLastError(), _T("MD")); + break; + + case ERROR_FILE_EXISTS: + case ERROR_ALREADY_EXISTS: + ConErrResPrintf(STRING_MD_ERROR, p[i]); + break; + + default: + ErrorMessage(GetLastError(), NULL); } nErrorLevel = 1; } @@ -504,7 +513,7 @@ INT cmd_rmdir(LPTSTR param) { /* Couldn't delete the folder, print out the error */ nError = GetLastError(); - ErrorMessage(nError, _T("RD")); + ErrorMessage(nError, NULL); } }

1 0

[reactos] 28/48: [CMD] Improve RMDIR help and MD error message.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1efbcd3d5d84389dec9ec… commit 1efbcd3d5d84389dec9ec54fbb9ca5d763abe874 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 1 02:06:42 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:04 2020 +0200 [CMD] Improve RMDIR help and MD error message. --- base/shell/cmd/lang/cs-CZ.rc | 8 ++++---- base/shell/cmd/lang/de-DE.rc | 6 ++++-- base/shell/cmd/lang/el-GR.rc | 8 ++++---- base/shell/cmd/lang/en-US.rc | 8 ++++---- base/shell/cmd/lang/es-ES.rc | 6 ++++-- base/shell/cmd/lang/fr-FR.rc | 8 ++++---- base/shell/cmd/lang/hu-HU.rc | 6 ++++-- base/shell/cmd/lang/id-ID.rc | 8 ++++---- base/shell/cmd/lang/it-IT.rc | 8 ++++---- base/shell/cmd/lang/ja-JP.rc | 4 ++-- base/shell/cmd/lang/no-NO.rc | 8 ++++---- base/shell/cmd/lang/pl-PL.rc | 8 ++++---- base/shell/cmd/lang/ro-RO.rc | 4 ++-- base/shell/cmd/lang/ru-RU.rc | 8 ++++---- base/shell/cmd/lang/sk-SK.rc | 8 ++++---- base/shell/cmd/lang/sq-AL.rc | 8 ++++---- base/shell/cmd/lang/sv-SE.rc | 8 ++++---- base/shell/cmd/lang/tr-TR.rc | 8 ++++---- base/shell/cmd/lang/uk-UA.rc | 8 ++++---- base/shell/cmd/lang/zh-CN.rc | 8 ++++---- base/shell/cmd/lang/zh-TW.rc | 8 ++++---- 21 files changed, 80 insertions(+), 74 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index a06ade2dfac..3499a2641a9 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -322,9 +322,9 @@ PAUSE [message]" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" STRING_RMDIR_HELP "Removes a directory.\n\n\ -RMDIR [drive:]path\nRD [drive:]path\n\ -/S Deletes all files and folders within target\n\ -/Q Doesn't prompt for user\n" +RMDIR [/S] [/Q] [drive:]path\nRD [/S] [/Q] [drive:]path\n\ + /S Deletes all files and folders within the target.\n\ + /Q Doesn't prompt for user.\n" STRING_RMDIR_HELP2 "Directory is not empty!\n" STRING_REN_HELP1 "Renames a file/directory or files/directories.\n\n\ RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ @@ -502,7 +502,7 @@ title new title\n" STRING_FREE_ERROR2 "bez popisku" STRING_GOTO_ERROR1 "Pro GOTO nebyl zadán popisek\n" STRING_GOTO_ERROR2 "Popisek '%s' nenalezen\n" - STRING_MD_ERROR "Podadresář nebo soubor už existuje.\n" + STRING_MD_ERROR "Podadresář nebo soubor %s už existuje.\n" STRING_MD_ERROR2 "Cesta do nového adresáře neexistuje.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Chyba]\n" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 4fa69baa07f..94cb49924e3 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -316,7 +316,9 @@ PAUSE [message]" STRING_PROMPT_HELP3 "\n 'PROMPT' setzt die Prompt auf die Standardwerte zurück." STRING_REM_HELP "Leitet Kommentare in einer Batchdatei ein.\n\nREM [Kommentar]" STRING_RMDIR_HELP "Löscht ein Verzeichnis.\n\n\ -RMDIR [Laufwerk:]Pfad\nRD [Laufwerk:]Pfad" +RMDIR [/S] [/Q] [Laufwerk:]Pfad\nRD [/S] [/Q] [Laufwerk:]Pfad\n\ + /S Deletes all files and folders within the target.\n\ + /Q Doesn't prompt for user.\n" STRING_RMDIR_HELP2 "Verzeichnis ist nicht leer!\n"//FIXME STRING_REN_HELP1 "Benennt Dateien und Verzeichnisse um.\n\n\ RENAME [/E /N /P /Q /S /T] alter_Name ... neuer_Name\n\ @@ -496,7 +498,7 @@ Titel neuer Titel" STRING_FREE_ERROR2 "keine Bezeichnung" STRING_GOTO_ERROR1 "Keine Sprungmarke für GOTO gesetzt\n" STRING_GOTO_ERROR2 "Sprungmarke '%s' wurde nicht gefunden\n" - STRING_MD_ERROR "Unterverzeichnis oder Datei existiert bereits.\n" + STRING_MD_ERROR "Unterverzeichnis oder Datei %s existiert bereits.\n" STRING_MD_ERROR2 "Der Pfad zum neuen Ordner existiert nicht.\n"//FIXME STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[FEHLER]\n" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index e49650da179..10a48f409e1 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -321,9 +321,9 @@ PAUSE [message]" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" STRING_RMDIR_HELP "Removes a directory.\n\n\ -RMDIR [drive:]path\nRD [drive:]path\n\ -/S Deletes all files and folders within target\n\ -/Q Doesn't prompt for user\n" +RMDIR [/S] [/Q] [drive:]path\nRD [/S] [/Q] [drive:]path\n\ + /S Deletes all files and folders within the target.\n\ + /Q Doesn't prompt for user.\n" STRING_RMDIR_HELP2 "Directory is not empty!\n" STRING_REN_HELP1 "Renames a file/directory or files/directories.\n\n\ RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ @@ -501,7 +501,7 @@ title new title\n" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" STRING_GOTO_ERROR2 "Label '%s' not found\n" - STRING_MD_ERROR "A subdirectory or file already exists.\n" + STRING_MD_ERROR "A subdirectory or file %s already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Σφάλμα]\n" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index 943c695b790..e5d0ea5056a 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -317,9 +317,9 @@ PAUSE [message]" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" STRING_RMDIR_HELP "Removes a directory.\n\n\ -RMDIR [drive:]path\nRD [drive:]path\n\ -/S Deletes all files and folders within target\n\ -/Q Doesn't prompt for user\n" +RMDIR [/S] [/Q] [drive:]path\nRD [/S] [/Q] [drive:]path\n\ + /S Deletes all files and folders within the target.\n\ + /Q Doesn't prompt for user.\n" STRING_RMDIR_HELP2 "Directory is not empty!\n" STRING_REN_HELP1 "Renames a file/directory or files/directories.\n\n\ RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ @@ -497,7 +497,7 @@ title new title\n" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" STRING_GOTO_ERROR2 "Label '%s' not found\n" - STRING_MD_ERROR "A subdirectory or file already exists.\n" + STRING_MD_ERROR "A subdirectory or file %s already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Error]\n" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 9998bfd1bad..786b5f7e974 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -322,7 +322,9 @@ PAUSE [mensaje]" comandos a su configuración por defecto." STRING_REM_HELP "Comienza una liena de comentarios en un archivo por lotes\n\nREM [Comentario]" STRING_RMDIR_HELP "Elimina un directorio.\n\n\ -RMDIR [unidad:]ruta\nRD [unidad:]ruta" +RMDIR [/S] [/Q] [unidad:]ruta\nRD [/S] [/Q] [unidad:]ruta\n\ + /S Deletes all files and folders within the target.\n\ + /Q Doesn't prompt for user.\n" STRING_RMDIR_HELP2 "La carpeta no está vacía.\n" STRING_REN_HELP1 "Renombra un archivo/directorio o varios archivos/directorios.\n\n\ RENAME [/E /N /P /Q /S /T] nombre_antiguo ... nuevo_nombre\n\ @@ -501,7 +503,7 @@ title Nuevo título\n" STRING_FREE_ERROR2 "Sin etiqueta" STRING_GOTO_ERROR1 "No se especifico etiqueta para GOTO\n" STRING_GOTO_ERROR2 "La etiqueta '%s' no se encuentra\n" - STRING_MD_ERROR "A subdirectory or file already exists.\n" + STRING_MD_ERROR "A subdirectory or file %s already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[Correcto]\n" STRING_MOVE_ERROR2 "[Error]\n" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 646791f8235..7a681fdf5b3 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -334,9 +334,9 @@ PAUSE [message]" STRING_PROMPT_HELP3 "\nTaper PROMPT sans paramètres pour changer l'invite à celui défini par défaut." STRING_REM_HELP "Démarrer une ligne de commentaire dans un fichier batch.\n\nREM [Commentaire]" STRING_RMDIR_HELP "Supprime un répertoire.\n\n\ -RMDIR [lecteur:]chemin\nRD [lecteur:]chemin\n\ -/S Supprime tous les fichiers et dossiers dans le répertoire cible\n\ -/Q N'interroge pas l'utilisateur\n" +RMDIR [/S] [/Q] [lecteur:]chemin\nRD [/S] [/Q] [lecteur:]chemin\n\ + /S Supprime tous les fichiers et dossiers dans le répertoire cible.\n\ + /Q N'interroge pas l'utilisateur.\n" STRING_RMDIR_HELP2 "Le répertoire n'est pas vide!\n" STRING_REN_HELP1 "Renomme un(des) fichier(s)/répertoire(s)\n\ RENAME [/E /N /P /Q /S /T] ancien_nom ... nouveau_nom\n\ @@ -513,7 +513,7 @@ titre titre de la fenêtre" STRING_FREE_ERROR2 "sans nom" STRING_GOTO_ERROR1 "Pas de label indiqué pour GOTO\n" STRING_GOTO_ERROR2 "Label '%s' introuvable\n" - STRING_MD_ERROR "Un sous répertoire ou un fichier existe déjà.\n" + STRING_MD_ERROR "Un sous-répertoire ou un fichier %s existe déjà.\n" STRING_MD_ERROR2 "Le chemin vers le nouveau répertoire n'existe pas.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Erreur]\n" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index 518c83364b3..d73faa7c2cc 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -303,7 +303,9 @@ PAUSE [message]" STRING_PROMPT_HELP3 "\nHa paraméter nélkül beírod a PROMPT parancsot, vissza áll az alapértelmezettre a kijelzés." STRING_REM_HELP "Megjegyzést jelölõ sor batch fájlokban.\n\nREM [megjegyzés]" STRING_RMDIR_HELP "Eltávolít egy mappát.\n\n\ -RMDIR [meghajtó:]elérési_út\nRD [meghajtó:]elérési_út" +RMDIR [/S] [/Q] [meghajtó:]elérési_út\nRD [/S] [/Q] [meghajtó:]elérési_út\n\ + /S Deletes all files and folders within the target.\n\ + /Q Doesn't prompt for user.\n" STRING_RMDIR_HELP2 "Directory is not empty!\n"//FIXME STRING_REN_HELP1 "Átnevez egy állományt.\n\n\ RENAME [/E /N /P /Q /S /T] régi_név ... új_név\n\ @@ -480,7 +482,7 @@ title new title\n" STRING_FREE_ERROR2 "nincs cimkézve" STRING_GOTO_ERROR1 "Nem lett cimke megadva a GOTO után\n" STRING_GOTO_ERROR2 "A '%s' cimke nem található\n" - STRING_MD_ERROR "A subdirectory or file already exists.\n"//FIXME + STRING_MD_ERROR "A subdirectory or file %s already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[HIBA]\n" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 42bd9e2b516..2f7ce290d59 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -318,9 +318,9 @@ PAUSE [pesan]" STRING_PROMPT_HELP3 "\nKetik PROMPT tanpa parameter untuk mereset prompt ke setelan standar." STRING_REM_HELP "Memulai baris komentar dalam file batch.\n\nREM [Komentar]" STRING_RMDIR_HELP "Menghapus direktori.\n\n\ -RMDIR [drive:]path\nRD [drive:]path\n\ -/S Menghapus semua file dan folder di dalam target\n\ -/Q Tidak bertanya pada pengguna\n" +RMDIR [/S] [/Q] [drive:]path\nRD [/S] [/Q] [drive:]path\n\ + /S Menghapus semua file dan folder di dalam target.\n\ + /Q Tidak bertanya pada pengguna.\n" STRING_RMDIR_HELP2 "Direktori tidak kosong!\n" STRING_REN_HELP1 "Mengganti nama file/direktori.\n\n\ RENAME [/E /N /P /Q /S /T] nama_lama ... nama_baru\n\ @@ -496,7 +496,7 @@ title judul baru\n" STRING_FREE_ERROR2 "tak berlabel" STRING_GOTO_ERROR1 "Tidak ada label ditetapkan untuk GOTO\n" STRING_GOTO_ERROR2 "Label '%s' tidak ditemukan\n" - STRING_MD_ERROR "Subdirektori atau file sudah ada.\n" + STRING_MD_ERROR "Subdirektori atau file %s sudah ada.\n" STRING_MD_ERROR2 "Path ke folder baru tidak ada.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Salah]\n" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 0f80bf5504a..e3485640449 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -324,9 +324,9 @@ PAUSE [messaggio]" STRING_REM_HELP "Inizia una linea di commento.\n\n\ REM [Commento]" STRING_RMDIR_HELP "Cancella una cartella.\n\n\ -RMDIR [disco:]percorso\nRD [disco:]percorso\n\ -/S cancella tutti i file e le cartelle indicate\n\ -/Q non chiede conferma\n" +RMDIR [/S] [/Q] [disco:]percorso\nRD [/S] [/Q] [disco:]percorso\n\ + /S Cancella tutti i file e le cartelle indicate.\n\ + /Q Non chiede conferma.\n" STRING_RMDIR_HELP2 "La cartella non è vuota!\n" STRING_REN_HELP1 "Rinomina file/cartella or file/cartelle.\n\n\ RENAME [/E /N /P /Q /S /T] vecchio_nome ... nuovo_nome\n\ @@ -506,7 +506,7 @@ titolo il nuovo titolo\n" STRING_FREE_ERROR2 "non etichettato" STRING_GOTO_ERROR1 "Nessuna etichetta indicata per GOTO\n" STRING_GOTO_ERROR2 "Etichetta '%s' non trovata\n" - STRING_MD_ERROR "Una cartella o file esiste già.\n" + STRING_MD_ERROR "Una cartella o file %s esiste già.\n" STRING_MD_ERROR2 "Il percorso della nuova cartella non esiste.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Errore]\n" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index 8d493993447..a0581742431 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -326,7 +326,7 @@ PAUSE [メッセージ]" STRING_PROMPT_HELP3 "\nパラメータを指定せずに PROMPT と入力すると、プロンプトの設定がデフォルトにリセットされます。" STRING_REM_HELP "バッチファイルにコメント (注釈) を記録します。\n\nREM [コメント]" STRING_RMDIR_HELP "ディレクトリを削除します。\n\n\ -RMDIR [ドライブ:]パス\nRD [ドライブ:]パス\n\ +RMDIR [/S] [/Q] [ドライブ:]パス\nRD [/S] [/Q] [ドライブ:]パス\n\ /S 指定されたディレクトリ内にあるファイルやフォルダもすべて削除します。\n\ /Q 確認のメッセージを表示しません。\n" STRING_RMDIR_HELP2 "ディレクトリが空ではありません!\n" @@ -504,7 +504,7 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_FREE_ERROR2 "ラベルがありません。" STRING_GOTO_ERROR1 "GOTO にラベルが指定されていません。\n" STRING_GOTO_ERROR2 "ラベル '%s' が見つかりませんでした。\n" - STRING_MD_ERROR "すでにディレクトリ内にサブディレクトリかファイルが存在しています。\n" + STRING_MD_ERROR "%s すでにディレクトリ内にサブディレクトリかファイルが存在しています。\n" STRING_MD_ERROR2 "新しいフォルダへのパスが存在していません。\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[エラー]\n" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index d5056d19e9d..7cb1bb65431 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -316,9 +316,9 @@ PAUSE [melding]" STRING_PROMPT_HELP3 "\nSkriv PROMPT uten parameter for å resette ledeteksten." STRING_REM_HELP "Start en kommentarlinje i en satsvis fil.\n\nREM [Kommentar]" STRING_RMDIR_HELP "Flytter en mappe.\n\n\ -RMDIR [stasjon:]mappe\nRD [stasjon:]mappe\n\ -/S Sletter alle filer og mapper innenfor målet\n\ -/Q Ikke spør før sletting.\n" +RMDIR [/S] [/Q] [stasjon:]mappe\nRD [/S] [/Q] [stasjon:]mappe\n\ + /S Sletter alle filer og mapper innenfor målet.\n\ + /Q Ikke spør før sletting.\n" STRING_RMDIR_HELP2 "Mappen er ikke tom!\n" STRING_REN_HELP1 "Endre navn på fil/mappe eller filer/mapper.\n\n\ ENDRE NAVN [/E /N /P /Q /S /T] gammelt_navn ... nytt_navn\n\ @@ -495,7 +495,7 @@ tittel ny tittel\n" STRING_FREE_ERROR2 "utmerket" STRING_GOTO_ERROR1 "Ingen merke spesifisert for GOTO\n" STRING_GOTO_ERROR2 "Merke '%s' ikke funnet\n" - STRING_MD_ERROR "En undermappe eller fil finnes allerede.\n" + STRING_MD_ERROR "En undermappe eller fil %s finnes allerede.\n" STRING_MD_ERROR2 "Stien til den nye mappen eksisterer ikke.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Feil]\n" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index c53eddf985c..49d89386170 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -324,9 +324,9 @@ PAUSE [wiadomość]" STRING_PROMPT_HELP3 "\nWpisz PROMPT bez żadnych parametrów, by powrócić do ustawień domyślnych." STRING_REM_HELP "Definiuje linię komentarza w pliku wsadowym.\n\nREM [komentarz]" STRING_RMDIR_HELP "Usuwa katalog.\n\n\ -RMDIR [napęd:]ścieżka\nRD [napęd:]ścieżka\n\ -/S Kasuje także wszystkie pliki i podkatalogi w danym katalogu\n\ -/Q Nie wyświetla prośby o potwierdzenie\n" +RMDIR [/S] [/Q] [napęd:]ścieżka\nRD [/S] [/Q] [napęd:]ścieżka\n\ + /S Kasuje także wszystkie pliki i podkatalogi w danym katalogu.\n\ + /Q Nie wyświetla prośby o potwierdzenie.\n" STRING_RMDIR_HELP2 "Katalog nie jest pusty!\n" STRING_REN_HELP1 "Zmienia nazwę pliku/katalogu (także wielu).\n\n\ RENAME [/E /N /P /Q /S /T] stara_nazwa ... nowa_nazwa\n\ @@ -502,7 +502,7 @@ title nowy tytuł okna\n" STRING_FREE_ERROR2 "brak" STRING_GOTO_ERROR1 "Brak etykiety dla GOTO\n" STRING_GOTO_ERROR2 "Etykieta '%s' nie została znaleziona\n" - STRING_MD_ERROR "Istnieje już plik lub podkatalog o tej nazwie.\n" + STRING_MD_ERROR "Istnieje już plik lub podkatalog %s o tej nazwie.\n" STRING_MD_ERROR2 "Ścieżka do nowego katalogu nie jest prawidłowa.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Błąd]\n" diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index f406454ee49..a9349427dc8 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -352,7 +352,7 @@ PAUSE [mesaj]\n" STRING_PROMPT_HELP3 "\nTastați PROMPT fără argumente pentru a readuce consola în starea implicită.\n" STRING_REM_HELP "Începe o linie de comentariu într-un fișier de comenzi.\n\nREM [comentariu]\n" STRING_RMDIR_HELP "Șterge un director.\n\n\ -RMDIR [unitate:]cale\nRD [unitate:]cale\n\ +RMDIR [/S] [/Q] [unitate:]cale\nRD [/S] [/Q] [unitate:]cale\n\ /S Șterge toate fișierele și directoarele țintă.\n\ /Q Omite cererile de confirmare.\n" STRING_RMDIR_HELP2 "Directorul nu este gol!\n" @@ -530,7 +530,7 @@ titlu Noul titlu.\n" STRING_FREE_ERROR2 "neetichetat" STRING_GOTO_ERROR1 "Nu a fost specificată nici o etichetă pentru «GOTO»\n" STRING_GOTO_ERROR2 "Eticheta «%s» nu a fost găsită\n" - STRING_MD_ERROR "Există deja un fișier sau un subdirector cu acest nume.\n" + STRING_MD_ERROR "Există deja un fișier sau un subdirector %s cu acest nume.\n" STRING_MD_ERROR2 "Calea către noul director nu există.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Eroare]\n" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index f4ffc1c91b9..64c217e547d 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -326,9 +326,9 @@ PAUSE [сообщение]" STRING_PROMPT_HELP3 "\nPROMPT без параметров устанавливает приглашение командной строки по умолчанию." STRING_REM_HELP "Помещение комментариев в пакетные файлы.\n\nREM [комментарий]" STRING_RMDIR_HELP "Удаление каталога.\n\n\ -RMDIR [диск:]путь\nRD [диск:]путь\n\ -/S Удаление дерева каталогов\n\ -/Q Отключение запроса подтверждения\n" +RMDIR [/S] [/Q] [диск:]путь\nRD [/S] [/Q] [диск:]путь\n\ + /S Удаление дерева каталогов.\n\ + /Q Отключение запроса подтверждения.\n" STRING_RMDIR_HELP2 "Каталог не пуст!\n" STRING_REN_HELP1 "Переименование одного или нескольких файлов/каталогов.\n\n\ RENAME [/E /N /P /Q /S /T] старое_имя ... новое_имя\n\ @@ -507,7 +507,7 @@ RESTORE восстанавливает окно\n\ STRING_FREE_ERROR2 "не отмечено" STRING_GOTO_ERROR1 "Не определена метка для GOTO\n" STRING_GOTO_ERROR2 "Метка '%s' не найдена\n" - STRING_MD_ERROR "Подкаталог или файл уже существует.\n" + STRING_MD_ERROR "Подкаталог или файл %s уже существует.\n" STRING_MD_ERROR2 "Путь к новому каталогу не существует.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Ошибка]\n" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 8f86dbd0d2f..3bb33e7c01a 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -323,9 +323,9 @@ PAUSE [message]" STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" STRING_RMDIR_HELP "Removes a directory.\n\n\ -RMDIR [drive:]path\nRD [drive:]path\n\ -/S Deletes all files and folders within target\n\ -/Q Doesn't prompt for user\n" +RMDIR [/S] [/Q] [drive:]path\nRD [/S] [/Q] [drive:]path\n\ + /S Deletes all files and folders within the target.\n\ + /Q Doesn't prompt for user.\n" STRING_RMDIR_HELP2 "Directory is not empty!\n" STRING_REN_HELP1 "Renames a file/directory or files/directories.\n\n\ RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ @@ -503,7 +503,7 @@ title new title\n" STRING_FREE_ERROR2 "unlabeled" STRING_GOTO_ERROR1 "No label specified for GOTO\n" STRING_GOTO_ERROR2 "Label '%s' not found\n" - STRING_MD_ERROR "A subdirectory or file already exists.\n" + STRING_MD_ERROR "A subdirectory or file %s already exists.\n" STRING_MD_ERROR2 "The path to the new folder does not exist.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Chyba]\n" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index c8b002590fa..f31217025f0 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -321,9 +321,9 @@ PAUZE [mesazhi]" STRING_PROMPT_HELP3 "\nSHFAQ pa parametra për të resetuar ne konfigurimet e automatizuara." STRING_REM_HELP "Nis një linjë koment në një dokument batch.\n\nREM [Koment" STRING_RMDIR_HELP "Heq një direktori.\n\n\ -RMDIR [drive:]rrugë\nRD [drive:]rrugë\n\ -/S Fshin të gjitha dokumentat dhe dosjet brenda objektivit\n\ -/Q Nuk e shfaq për përdoruesin\n" +RMDIR [/S] [/Q] [drive:]rrugë\nRD [/S] [/Q] [drive:]rrugë\n\ + /S Fshin të gjitha dokumentat dhe dosjet brenda objektivit.\n\ + /Q Nuk e shfaq për përdoruesin.\n" STRING_RMDIR_HELP2 "Direktoria nuk është e zbrazët!\n" STRING_REN_HELP1 "Emeron nje dokument/directori ose dokument/skedë.\n\n\ RENAME [/E /N /P /Q /S /T] emrin_e_vjetër ... emrin_e_ri\n\ @@ -501,7 +501,7 @@ title titull i ri\n" STRING_FREE_ERROR2 "E paetiketuar" STRING_GOTO_ERROR1 "Nuk ka etiketa specifikuar për GOTO\n" STRING_GOTO_ERROR2 "Etikete '%s' Nuk u gjet\n" - STRING_MD_ERROR "Një nën-skedë ose dokument ekziston.\n" + STRING_MD_ERROR "Një nën-skedë ose dokument %s ekziston.\n" STRING_MD_ERROR2 "Rruga për tek skeda e re nuk ekziston.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Error]\n" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 4636c1e52e2..41c5131f015 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -316,9 +316,9 @@ PAUSE [melding]" STRING_PROMPT_HELP3 "\nSkriv PROMPT uten parameter för att resette ledetexten." STRING_REM_HELP "Start en kommentarlinje i en batch-fil.\n\nREM [Kommentar]" STRING_RMDIR_HELP "Flytter en mapp.\n\n\ -RMDIR [enhet:]mapp\nRD [enhet:]mapp\n\ -/S Sletter alle filer och mappar innenfor målet\n\ -/Q Inte spør før sletting.\n" +RMDIR [/S] [/Q] [enhet:]mapp\nRD [/S] [/Q] [enhet:]mapp\n\ + /S Sletter alle filer och mappar innenfor målet.\n\ + /Q Inte spør før sletting.\n" STRING_RMDIR_HELP2 "mappn är inte tom!\n" STRING_REN_HELP1 "Ändra namn på fil/mapp eller filer/mappar.\n\n\ ENDRE NAVN [/E /N /P /Q /S /T] gammelt_namn ... nytt_namn\n\ @@ -495,7 +495,7 @@ tittel ny tittel\n" STRING_FREE_ERROR2 "utmärkt" STRING_GOTO_ERROR1 "Inget märke specifiserat för GOTO\n" STRING_GOTO_ERROR2 "Märke '%s' finns inte\n" - STRING_MD_ERROR "En undermapp eller fil finns redan.\n" + STRING_MD_ERROR "En undermapp eller fil %s finns redan.\n" STRING_MD_ERROR2 "Stien till den nye mappen exsisterar inte.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Fel]\n" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index e113222c039..44810d8fef2 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -324,9 +324,9 @@ PAUSE [ileti]" STRING_PROMPT_HELP3 "\nÖn tanımlı ayarlamaya istemi sıfırlamak için değişkensiz PROMPT yazınız." STRING_REM_HELP "Bir toplu iş kütüğünde bir açıklama yatacı başlatır.\n\nREM [Açıklama]" STRING_RMDIR_HELP "Bir dizin siler.\n\n\ -RMDIR [sürücü:]yol\nRD [sürücü:]yol\n\ -/S Varış içinde tüm kütükleri ve dizinleri siler.\n\ -/Q Kullanıcı için sorma.\n" +RMDIR [/S] [/Q] [sürücü:]yol\nRD [/S] [/Q] [sürücü:]yol\n\ + /S Varış içinde tüm kütükleri ve dizinleri siler.\n\ + /Q Kullanıcı için sorma.\n" STRING_RMDIR_HELP2 "Dizin boş değil!\n" STRING_REN_HELP1 "Bir kütüğü/dizini ya da kütükleri/dizinleri yeniden adlandırır.\n\n\ RENAME [/E /N /P /Q /S /T] eski ad ... yeni ad\n\ @@ -502,7 +502,7 @@ başlık Yeni başlık\n" STRING_FREE_ERROR2 "etiketlenmemiş" STRING_GOTO_ERROR1 "GOTO için bir etiket belirlenmemiş.\n" STRING_GOTO_ERROR2 """%s"" etiketi bulunamadı.\n" - STRING_MD_ERROR "Bir alt dizin ya da kütük önceden var.\n" + STRING_MD_ERROR "Bir alt dizin ya da kütük %s önceden var.\n" STRING_MD_ERROR2 "Yeni dizin için yol yok.\n" STRING_MOVE_ERROR1 "[Tamam]\n" STRING_MOVE_ERROR2 "[Yanlışlık]\n" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 8ea0e7f5512..2b6a6e85348 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -328,9 +328,9 @@ PAUSE [повiдомлення]" STRING_PROMPT_HELP3 "\nPROMPT без параметрiв встановлює запрошення командного рядка за замовчуванням." STRING_REM_HELP "Стартує рядок коментаря впакетному файлi.\n\nREM [Comment]" STRING_RMDIR_HELP "Видалення каталогу.\n\n\ -RMDIR [диск:]шлях\nRD [диск:]шлях\n\ -/S Видалення всього дерева всерединi цiлi\n\ -/Q Вимкнення запиту пiдтвердження\n" +RMDIR [/S] [/Q] [диск:]шлях\nRD [/S] [/Q] [диск:]шлях\n\ + /S Видалення всього дерева всерединi цiлi.\n\ + /Q Вимкнення запиту пiдтвердження.\n" STRING_RMDIR_HELP2 "Каталог не порожнiй!\n" STRING_REN_HELP1 "Перейменування одного чи кiлькох файлiв/каталогiв.\n\n\ RENAME [/E /N /P /Q /S /T] старе_iм'я ... нове_iм'я\n\ @@ -507,7 +507,7 @@ title новий заголовок\n" STRING_FREE_ERROR2 "не вiдмiчено" STRING_GOTO_ERROR1 "Не визначена мiтка для GOTO\n" STRING_GOTO_ERROR2 "Мiтка '%s' не знайдена\n" - STRING_MD_ERROR "Пiдкаталог чи файл вже iснує.\n" + STRING_MD_ERROR "Пiдкаталог чи файл %s вже iснує.\n" STRING_MD_ERROR2 "Шлях до нового каталогу не iснує.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Помилка]\n" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index b8421123d95..724459ca8f4 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -301,9 +301,9 @@ PAUSE [消息]" STRING_PROMPT_HELP3 "\n执行不带参数的 PROMPT 将会把提示符重置为默认设置。" STRING_REM_HELP "在批处理文件中开始一行注释。\n\nREM [注释]" STRING_RMDIR_HELP "删除一个目录。\n\n\ -RMDIR [驱动器:]路径\nRD [驱动器:]路径\n\ -/S 删除目标中的所有文件和文件夹。\n\ -/Q 删除时不要提示。\n" +RMDIR [/S] [/Q] [驱动器:]路径\nRD [/S] [/Q] [驱动器:]路径\n\ + /S 删除目标中的所有文件和文件夹。\n\ + /Q 删除时不要提示。\n" STRING_RMDIR_HELP2 "目录非空！\n" STRING_REN_HELP1 "重命名一个或者多个文件或文件夹。\n\n\ RENAME [/E /N /P /Q /S /T] 旧名称 ... 新名称\n\ @@ -467,7 +467,7 @@ RESTORE 恢复窗口\n\ STRING_FREE_ERROR2 "未标记" STRING_GOTO_ERROR1 "没有为 GOTO 指定标签\n" STRING_GOTO_ERROR2 "标签 '%s' 未找到\n" - STRING_MD_ERROR "一个子目录或文件已存在。\n" + STRING_MD_ERROR "%s 一个子目录或文件已存在。\n" STRING_MD_ERROR2 "到新文件夹的路径不存在。\n" STRING_MOVE_ERROR1 "[成功]\n" STRING_MOVE_ERROR2 "[错误]\n" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 18248aec402..d4e37356d5b 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -302,9 +302,9 @@ PAUSE [訊息]" STRING_PROMPT_HELP3 "\n執行不帶參數的 PROMPT 將會把提示符重置為默認設定。" STRING_REM_HELP "在批處理檔案中開始一行註釋。\n\nREM [註釋]" STRING_RMDIR_HELP "刪除一個目錄。\n\n\ -RMDIR [驅動器:]路徑\nRD [驅動器:]路徑\n\ -/S 刪除目標中的所有檔案和資料夾。\n\ -/Q 刪除時不要提示。\n" +RMDIR [/S] [/Q] [驅動器:]路徑\nRD [/S] [/Q] [驅動器:]路徑\n\ + /S 刪除目標中的所有檔案和資料夾。\n\ + /Q 刪除時不要提示。\n" STRING_RMDIR_HELP2 "目錄非空！\n" STRING_REN_HELP1 "重新命名一個或者多個檔案或資料夾。\n\n\ RENAME [/E /N /P /Q /S /T] 舊名稱 ... 新名稱\n\ @@ -468,7 +468,7 @@ RESTORE 恢復視窗\n\ STRING_FREE_ERROR2 "未標記" STRING_GOTO_ERROR1 "沒有為 GOTO 指定標籤\n" STRING_GOTO_ERROR2 "標籤 '%s' 未找到\n" - STRING_MD_ERROR "一個子目錄或檔案已存在。\n" + STRING_MD_ERROR "%s 一個子目錄或檔案已存在。\n" STRING_MD_ERROR2 "到新資料夾的路徑不存在。\n" STRING_MOVE_ERROR1 "[成功]\n" STRING_MOVE_ERROR2 "[錯誤]\n"

1 0

[reactos] 27/48: [CMD] Fix the output of the SET command.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3ed502bb67fd6ead237a… commit e3ed502bb67fd6ead237a2e65849d0f6d7b9e29d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 9 00:35:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:04 2020 +0200 [CMD] Fix the output of the SET command. --- base/shell/cmd/set.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index 3ba2f069cf3..7a4a5d4c408 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -92,10 +92,13 @@ INT cmd_set(LPTSTR param) lpOutput = lpEnv; while (*lpOutput) { + /* Do not display the special '=X:' environment variables */ if (*lpOutput != _T('=')) + { ConOutPuts(lpOutput); + ConOutChar(_T('\n')); + } lpOutput += _tcslen(lpOutput) + 1; - ConOutChar(_T('\n')); } FreeEnvironmentStrings(lpEnv); }

1 0

[reactos] 26/48: [CMD] Some code style and formatting fixes
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca4523658c9d5439af6c9… commit ca4523658c9d5439af6c9fe035fbae10ee69bb72 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:32:30 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:04 2020 +0200 [CMD] Some code style and formatting fixes --- base/shell/cmd/error.c | 6 +- base/shell/cmd/internal.c | 144 +++++++++++++++--------------- base/shell/cmd/set.c | 217 ++++++++++++++++++++++++++-------------------- 3 files changed, 203 insertions(+), 164 deletions(-) diff --git a/base/shell/cmd/error.c b/base/shell/cmd/error.c index c0f61fd00a7..193f785caca 100644 --- a/base/shell/cmd/error.c +++ b/base/shell/cmd/error.c @@ -46,9 +46,9 @@ ErrorMessage( va_end(arg_ptr); } - if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&szError, 0, NULL)) + if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&szError, 0, NULL)) { ConErrPrintf(_T("%s %s\n"), szError, szMessage); if (szError) diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index b81e6cb5645..8798eecdd31 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -141,41 +141,44 @@ #ifdef INCLUDE_CMD_CHDIR -/* helper functions for getting current path from drive - without changing drive. Return code 0 = ok, 1 = fail. - INT GetRootPath("C:",outbuffer,chater size of outbuffer); - the first param can have any size, if the the two frist - letter are not a drive with : it will get Currentpath on - current drive exactly as GetCurrentDirectory does. - */ - -INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) +/* + * Helper function for getting the current path from drive + * without changing the drive. Return code: 0 = ok, 1 = fail. + * 'InPath' can have any size; if the two first letters are + * not a drive with ':' it will get the current path on + * the current drive exactly as GetCurrentDirectory() does. + */ +INT +GetRootPath( + IN LPTSTR InPath, + OUT LPTSTR OutPath, + IN INT size) { if (InPath[0] && InPath[1] == _T(':')) { - INT t=0; + INT t = 0; if ((InPath[0] >= _T('0')) && (InPath[0] <= _T('9'))) { - t = (InPath[0] - _T('0')) +28; + t = (InPath[0] - _T('0')) + 28; } if ((InPath[0] >= _T('a')) && (InPath[0] <= _T('z'))) { - t = (InPath[0] - _T('a')) +1; + t = (InPath[0] - _T('a')) + 1; InPath[0] = t + _T('A') - 1; } if ((InPath[0] >= _T('A')) && (InPath[0] <= _T('Z'))) { - t = (InPath[0] - _T('A')) +1; + t = (InPath[0] - _T('A')) + 1; } - return _tgetdcwd(t,OutPath,size) == NULL; + return (_tgetdcwd(t, OutPath, size) == NULL); } /* Get current directory */ - return !GetCurrentDirectory(size,OutPath); + return !GetCurrentDirectory(size, OutPath); } @@ -187,19 +190,19 @@ BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) StripQuotes(InPath); /* Retrieve the full path name from the (possibly relative) InPath */ - if (GetFullPathName(InPath, MAX_PATH, OutPathTemp, NULL) == 0) + if (GetFullPathName(InPath, ARRAYSIZE(OutPathTemp), OutPathTemp, NULL) == 0) goto Fail; /* Convert the full path to its correct case. * Example: c:\windows\SYSTEM32 => C:\WINDOWS\System32 */ GetPathCase(OutPathTemp, OutPath); - /* Use _tchdir, since unlike SetCurrentDirectory it updates + /* Use _tchdir(), since unlike SetCurrentDirectory() it updates * the current-directory-on-drive environment variables. */ if (_tchdir(OutPath) != 0) goto Fail; - /* Keep original drive in ordinary CD/CHDIR (without /D switch). */ + /* Keep the original drive in ordinary CD/CHDIR (without /D switch) */ if (oldpath != NULL && _tcsncicmp(OutPath, oldpath, 2) != 0) SetCurrentDirectory(oldpath); @@ -214,9 +217,8 @@ Fail: /* * CD / CHDIR - * */ -INT cmd_chdir (LPTSTR param) +INT cmd_chdir(LPTSTR param) { BOOL bChangeDrive = FALSE; LPTSTR tmp; @@ -224,10 +226,10 @@ INT cmd_chdir (LPTSTR param) /* Filter out special cases first */ - /* Print Help */ + /* Print help */ if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_CD_HELP); + ConOutResPaging(TRUE, STRING_CD_HELP); return 0; } @@ -235,16 +237,16 @@ INT cmd_chdir (LPTSTR param) StripQuotes(param); tmp = param + _tcslen(param) - 1; while (tmp > param && _istspace(*tmp)) - tmp--; + --tmp; *(tmp + 1) = _T('\0'); - /* Set Error Level to Success */ + /* Reset the error level */ nErrorLevel = 0; - /* Print Current Directory on a disk */ + /* Print the current directory on a disk */ if (_tcslen(param) == 2 && param[1] == _T(':')) { - if (GetRootPath(param, szCurrent, MAX_PATH)) + if (GetRootPath(param, szCurrent, ARRAYSIZE(szCurrent))) { error_invalid_drive(); return 1; @@ -253,21 +255,21 @@ INT cmd_chdir (LPTSTR param) return 0; } - /* Get Current Directory */ - GetCurrentDirectory(MAX_PATH, szCurrent); + /* Get the current directory */ + GetCurrentDirectory(ARRAYSIZE(szCurrent), szCurrent); if (param[0] == _T('\0')) { ConOutPrintf(_T("%s\n"), szCurrent); return 0; } - /* Input String Contains /D Switch */ + /* If the input string is prefixed with the /D switch, change the drive */ if (!_tcsncicmp(param, _T("/D"), 2)) { bChangeDrive = TRUE; param += 2; while (_istspace(*param)) - param++; + ++param; } if (!SetRootPath(bChangeDrive ? NULL : szCurrent, param)) @@ -362,7 +364,6 @@ INT cmd_mkdir (LPTSTR param) } #endif - #ifdef INCLUDE_CMD_RMDIR /* * RD / RMDIR @@ -373,8 +374,10 @@ BOOL DeleteFolder(LPTSTR FileName) TCHAR TempFileName[MAX_PATH]; HANDLE hFile; WIN32_FIND_DATA f; - _tcscpy(Base,FileName); - _tcscat(Base,_T("\\*")); + + _tcscpy(Base, FileName); + _tcscat(Base, _T("\\*")); + hFile = FindFirstFile(Base, &f); Base[_tcslen(Base) - 1] = _T('\0'); if (hFile != INVALID_HANDLE_VALUE) @@ -383,68 +386,70 @@ BOOL DeleteFolder(LPTSTR FileName) { if (!_tcscmp(f.cFileName, _T(".")) || !_tcscmp(f.cFileName, _T(".."))) + { continue; - _tcscpy(TempFileName,Base); - _tcscat(TempFileName,f.cFileName); + } + + _tcscpy(TempFileName, Base); + _tcscat(TempFileName, f.cFileName); if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { DeleteFolder(TempFileName); + } else { - SetFileAttributes(TempFileName,FILE_ATTRIBUTE_NORMAL); + SetFileAttributes(TempFileName, FILE_ATTRIBUTE_NORMAL); if (!DeleteFile(TempFileName)) { - FindClose (hFile); + FindClose(hFile); return 0; } } - }while (FindNextFile (hFile, &f)); - FindClose (hFile); + } while (FindNextFile(hFile, &f)); + FindClose(hFile); } + return RemoveDirectory(FileName); } -INT cmd_rmdir (LPTSTR param) +INT cmd_rmdir(LPTSTR param) { - TCHAR ch; + INT nError = 0; + INT res; + LPTSTR *arg; INT args; INT dirCount; - LPTSTR *arg; INT i; - BOOL RD_SUB = FALSE; - BOOL RD_QUIET = FALSE; - INT res; - INT nError = 0; + TCHAR ch; + BOOL bRecurseDir = FALSE; + BOOL bQuiet = FALSE; TCHAR szFullPath[MAX_PATH]; - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_RMDIR_HELP); return 0; } - arg = split (param, &args, FALSE, FALSE); + arg = split(param, &args, FALSE, FALSE); dirCount = 0; - /* check for options anywhere in command line */ + /* Check for options anywhere in command line */ for (i = 0; i < args; i++) { if (*arg[i] == _T('/')) { - /*found a command, but check to make sure it has something after it*/ - if (_tcslen (arg[i]) == 2) + /* Found an option, but check to make sure it has something after it */ + if (_tcslen(arg[i]) == 2) { - ch = _totupper (arg[i][1]); + ch = _totupper(arg[i][1]); if (ch == _T('S')) - { - RD_SUB = TRUE; - } + bRecurseDir = TRUE; else if (ch == _T('Q')) - { - RD_QUIET = TRUE; - } + bQuiet = TRUE; } } else @@ -466,25 +471,26 @@ INT cmd_rmdir (LPTSTR param) if (*arg[i] == _T('/')) continue; - if (RD_SUB) + if (bRecurseDir) { - /* ask if they want to delete everything in the folder */ - if (!RD_QUIET) + /* Ask the user whether to delete everything in the folder */ + if (!bQuiet) { - res = FilePromptYNA (STRING_DEL_HELP2); + res = FilePromptYNA(STRING_DEL_HELP2); if (res == PROMPT_NO || res == PROMPT_BREAK) { nError = 1; continue; } if (res == PROMPT_ALL) - RD_QUIET = TRUE; + bQuiet = TRUE; } - /* get the folder name */ - GetFullPathName(arg[i],MAX_PATH,szFullPath,NULL); - /* remove trailing \ if any, but ONLY if dir is not the root dir */ - if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\')) + /* Get the folder name */ + GetFullPathName(arg[i], ARRAYSIZE(szFullPath), szFullPath, NULL); + + /* Remove trailing \ if any, but ONLY if dir is not the root dir */ + if (_tcslen(szFullPath) >= 2 && szFullPath[_tcslen(szFullPath) - 1] == _T('\\')) szFullPath[_tcslen(szFullPath) - 1] = _T('\0'); res = DeleteFolder(szFullPath); @@ -502,7 +508,7 @@ INT cmd_rmdir (LPTSTR param) } } - freep (arg); + freep(arg); return nError; } #endif @@ -601,7 +607,7 @@ INT CommandRem (LPTSTR param) #endif /* INCLUDE_CMD_REM */ -INT CommandShowCommands (LPTSTR param) +INT CommandShowCommands(LPTSTR param) { PrintCommandList(); return 0; diff --git a/base/shell/cmd/set.c b/base/shell/cmd/set.c index 4416e925663..3ba2f069cf3 100644 --- a/base/shell/cmd/set.c +++ b/base/shell/cmd/set.c @@ -38,18 +38,17 @@ #ifdef INCLUDE_CMD_SET - -/* initial size of environment variable buffer */ +/* Initial size of environment variable buffer */ #define ENV_BUFFER_SIZE 1024 static BOOL -seta_eval ( LPCTSTR expr ); +seta_eval(LPCTSTR expr); static LPCTSTR -skip_ws ( LPCTSTR p ) +skip_ws(LPCTSTR p) { while (*p && *p <= _T(' ')) - p++; + ++p; return p; } @@ -70,13 +69,13 @@ GetQuotedString(TCHAR *p) return p; } -INT cmd_set (LPTSTR param) +INT cmd_set(LPTSTR param) { LPTSTR p; LPTSTR lpEnv; LPTSTR lpOutput; - if ( !_tcsncmp (param, _T("/?"), 2) ) + if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_SET_HELP); return 0; @@ -84,10 +83,10 @@ INT cmd_set (LPTSTR param) param = (LPTSTR)skip_ws(param); - /* if no parameters, show the environment */ + /* If no parameters, show the environment */ if (param[0] == _T('\0')) { - lpEnv = (LPTSTR)GetEnvironmentStrings (); + lpEnv = (LPTSTR)GetEnvironmentStrings(); if (lpEnv) { lpOutput = lpEnv; @@ -98,21 +97,21 @@ INT cmd_set (LPTSTR param) lpOutput += _tcslen(lpOutput) + 1; ConOutChar(_T('\n')); } - FreeEnvironmentStrings (lpEnv); + FreeEnvironmentStrings(lpEnv); } return 0; } - /* the /A does *NOT* have to be followed by a whitespace */ - if ( !_tcsnicmp (param, _T("/A"), 2) ) + /* The /A does *NOT* have to be followed by a whitespace */ + if (!_tcsnicmp(param, _T("/A"), 2)) { BOOL Success; StripQuotes(param); - Success = seta_eval ( skip_ws(param+2) ); + Success = seta_eval(skip_ws(param + 2)); if (!Success) { - /* might seem random but this is what windows xp does */ + /* Might seem random but this is what windows xp does -- This is a message ID */ nErrorLevel = 9165; } return !Success; @@ -132,7 +131,7 @@ INT cmd_set (LPTSTR param) *p++ = _T('\0'); ConOutPrintf(_T("%s"), GetQuotedString(p)); - ConInString(value, 1023); + ConInString(value, ARRAYSIZE(value)); if (!*value || !SetEnvironmentVariable(param, value)) { @@ -144,13 +143,13 @@ INT cmd_set (LPTSTR param) param = GetQuotedString(param); - p = _tcschr (param, _T('=')); + p = _tcschr(param, _T('=')); if (p) { - /* set or remove environment variable */ + /* Set or remove the environment variable */ if (p == param) { - /* handle set =val case */ + /* Handle set =val case */ ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); nErrorLevel = 1; return 1; @@ -165,7 +164,7 @@ INT cmd_set (LPTSTR param) } else { - /* display all environment variable with the given prefix */ + /* Display all the environment variables with the given prefix */ BOOL bFound = FALSE; while (_istspace(*param) || *param == _T(',') || *param == _T(';')) @@ -195,7 +194,7 @@ INT cmd_set (LPTSTR param) if (!bFound) { - ConErrResPrintf (STRING_PATH_ERROR, param); + ConErrResPrintf(STRING_PATH_ERROR, param); nErrorLevel = 1; return 1; } @@ -208,36 +207,38 @@ static INT ident_len(LPCTSTR p) { LPCTSTR p2 = p; - if ( __iscsymf(*p) ) + if (__iscsymf(*p)) { ++p2; - while ( __iscsym(*p2) ) + while (__iscsym(*p2)) ++p2; } return (INT)(p2-p); } -#define PARSE_IDENT(ident,identlen,p) \ +#define PARSE_IDENT(ident, identlen, p) \ +do { \ identlen = ident_len(p); \ - ident = (LPTSTR)alloca ( ( identlen + 1 ) * sizeof(TCHAR) ); \ - memmove ( ident, p, identlen * sizeof(TCHAR) ); \ + ident = (LPTSTR)alloca((identlen + 1) * sizeof(TCHAR)); \ + memmove(ident, p, identlen * sizeof(TCHAR)); \ ident[identlen] = 0; \ - p += identlen; + p += identlen; \ +} while (0) static INT seta_identval(LPCTSTR ident) { - LPCTSTR identVal = GetEnvVarOrSpecial ( ident ); - if ( !identVal ) + LPCTSTR identVal = GetEnvVarOrSpecial(ident); + if (!identVal) return 0; else - return _tcstol ( identVal, NULL, 0 ); + return _tcstol(identVal, NULL, 0); } static BOOL calc(INT* lval, TCHAR op, INT rval) { - switch ( op ) + switch (op) { case '*': *lval *= rval; @@ -264,49 +265,50 @@ calc(INT* lval, TCHAR op, INT rval) *lval |= rval; break; default: - ConErrResPuts ( STRING_INVALID_OPERAND ); + ConErrResPuts(STRING_INVALID_OPERAND); return FALSE; } return TRUE; } static BOOL -seta_stmt (LPCTSTR* p_, INT* result); +seta_stmt(LPCTSTR* p_, INT* result); static BOOL seta_unaryTerm(LPCTSTR* p_, INT* result) { LPCTSTR p = *p_; - if ( *p == _T('(') ) + + if (*p == _T('(')) { INT rval; - p = skip_ws ( p + 1 ); - if ( !seta_stmt ( &p, &rval ) ) + p = skip_ws(p + 1); + if (!seta_stmt(&p, &rval)) return FALSE; - if ( *p++ != _T(')') ) + if (*p++ != _T(')')) { - ConErrResPuts ( STRING_EXPECTED_CLOSE_PAREN ); + ConErrResPuts(STRING_EXPECTED_CLOSE_PAREN); return FALSE; } *result = rval; } - else if ( isdigit(*p) ) + else if (isdigit(*p)) { - *result = _tcstol ( p, (LPTSTR *)&p, 0 ); + *result = _tcstol(p, (LPTSTR*)&p, 0); } - else if ( __iscsymf(*p) ) + else if (__iscsymf(*p)) { LPTSTR ident; INT identlen; - PARSE_IDENT(ident,identlen,p); - *result = seta_identval ( ident ); + PARSE_IDENT(ident, identlen, p); + *result = seta_identval(ident); } else { - ConErrResPuts ( STRING_EXPECTED_NUMBER_OR_VARIABLE ); + ConErrResPuts(STRING_EXPECTED_NUMBER_OR_VARIABLE); return FALSE; } - *p_ = skip_ws ( p ); + *p_ = skip_ws(p); return TRUE; } @@ -316,14 +318,15 @@ seta_mulTerm(LPCTSTR* p_, INT* result) LPCTSTR p = *p_; TCHAR op = 0; INT rval; - if ( _tcschr(_T("!~-"),*p) ) + + if (_tcschr(_T("!~-"), *p)) { op = *p; - p = skip_ws ( p + 1 ); + p = skip_ws(p + 1); } - if ( !seta_unaryTerm ( &p, &rval ) ) + if (!seta_unaryTerm(&p, &rval)) return FALSE; - switch ( op ) + switch (op) { case '!': rval = !rval; @@ -346,19 +349,24 @@ seta_ltorTerm(LPCTSTR* p_, INT* result, LPCTSTR ops, BOOL (*subTerm)(LPCTSTR*,IN { LPCTSTR p = *p_; INT lval; - if ( !subTerm ( &p, &lval ) ) + + /* Evaluate the left-hand side */ + if (!subTerm(&p, &lval)) return FALSE; - while ( *p && _tcschr(ops,*p) ) + + while (*p && _tcschr(ops, *p)) { INT rval; TCHAR op = *p; - p = skip_ws ( p+1 ); + p = skip_ws(p + 1); - if ( !subTerm ( &p, &rval ) ) + /* Evaluate the immediate right-hand side */ + if (!subTerm(&p, &rval)) return FALSE; - if ( !calc ( &lval, op, rval ) ) + /* This becomes the new left-hand side for the next iteration */ + if (!calc(&lval, op, rval)) return FALSE; } @@ -370,13 +378,13 @@ seta_ltorTerm(LPCTSTR* p_, INT* result, LPCTSTR ops, BOOL (*subTerm)(LPCTSTR*,IN static BOOL seta_addTerm(LPCTSTR* p_, INT* result) { - return seta_ltorTerm ( p_, result, _T("*/%"), seta_mulTerm ); + return seta_ltorTerm(p_, result, _T("*/%"), seta_mulTerm); } static BOOL seta_logShiftTerm(LPCTSTR* p_, INT* result) { - return seta_ltorTerm ( p_, result, _T("+-"), seta_addTerm ); + return seta_ltorTerm(p_, result, _T("+-"), seta_addTerm); } static BOOL @@ -384,19 +392,25 @@ seta_bitAndTerm(LPCTSTR* p_, INT* result) { LPCTSTR p = *p_; INT lval; - if ( !seta_logShiftTerm ( &p, &lval ) ) + + /* Evaluate the left-hand side */ + if (!seta_logShiftTerm(&p, &lval)) return FALSE; - while ( *p && _tcschr(_T("<>"),*p) && p[0] == p[1] ) + + /* Handle << >> operators */ + while (*p && _tcschr(_T("<>"), *p) && p[0] == p[1]) { INT rval; TCHAR op = *p; - p = skip_ws ( p+2 ); + p = skip_ws(p + 2); - if ( !seta_logShiftTerm ( &p, &rval ) ) + /* Evaluate the immediate right-hand side */ + if (!seta_logShiftTerm(&p, &rval)) return FALSE; - switch ( op ) + /* This becomes the new left-hand side for the next iteration */ + switch (op) { case '<': { @@ -408,11 +422,13 @@ seta_bitAndTerm(LPCTSTR* p_, INT* result) lval <<= rval; break; } + case '>': lval >>= rval; break; + default: - ConErrResPuts ( STRING_INVALID_OPERAND ); + ConErrResPuts(STRING_INVALID_OPERAND); return FALSE; } } @@ -425,19 +441,19 @@ seta_bitAndTerm(LPCTSTR* p_, INT* result) static BOOL seta_bitExclOrTerm(LPCTSTR* p_, INT* result) { - return seta_ltorTerm ( p_, result, _T("&"), seta_bitAndTerm ); + return seta_ltorTerm(p_, result, _T("&"), seta_bitAndTerm); } static BOOL seta_bitOrTerm(LPCTSTR* p_, INT* result) { - return seta_ltorTerm ( p_, result, _T("^"), seta_bitExclOrTerm ); + return seta_ltorTerm(p_, result, _T("^"), seta_bitExclOrTerm); } static BOOL seta_expr(LPCTSTR* p_, INT* result) { - return seta_ltorTerm ( p_, result, _T("|"), seta_bitOrTerm ); + return seta_ltorTerm(p_, result, _T("|"), seta_bitOrTerm); } static BOOL @@ -448,34 +464,40 @@ seta_assignment(LPCTSTR* p_, INT* result) TCHAR op = 0; INT identlen, exprval; - PARSE_IDENT(ident,identlen,p); - if ( identlen ) + PARSE_IDENT(ident, identlen, p); + if (identlen) { p = skip_ws(p); - if ( *p == _T('=') ) - op = *p, p = skip_ws(p+1); - else if ( _tcschr ( _T("*/%+-&^|"), *p ) && p[1] == _T('=') ) - op = *p, p = skip_ws(p+2); - else if ( _tcschr ( _T("<>"), *p ) && *p == p[1] && p[2] == _T('=') ) - op = *p, p = skip_ws(p+3); + /* Handle = assignment */ + if (*p == _T('=')) + op = *p, p = skip_ws(p + 1); + /* Handle *= /= %= += -= &= ^= |= assignments */ + else if (_tcschr(_T("*/%+-&^|"), *p) && p[1] == _T('=')) + op = *p, p = skip_ws(p + 2); + /* Handle <<= >>= assignments */ + else if (_tcschr(_T("<>"), *p) && *p == p[1] && p[2] == _T('=')) + op = *p, p = skip_ws(p + 3); } - /* allow to chain multiple assignments, such as: a=b=1 */ - if ( ident && op ) + /* Allow to chain multiple assignments, such as: a=b=1 */ + if (ident && op) { INT identval; LPTSTR buf; - if ( !seta_assignment ( &p, &exprval ) ) + if (!seta_assignment(&p, &exprval)) return FALSE; - identval = seta_identval ( ident ); + identval = seta_identval(ident); - switch ( op ) + switch (op) { + /* Handle = assignment */ case '=': identval = exprval; break; + + /* Handle <<= assignment */ case '<': { /* Shift left has to be a positive number, 0-31 otherwise 0 is returned, @@ -486,23 +508,28 @@ seta_assignment(LPCTSTR* p_, INT* result) identval <<= exprval; break; } + + /* Handle >>= assignment */ case '>': identval >>= exprval; break; + + /* Other assignments */ default: - if ( !calc ( &identval, op, exprval ) ) + if (!calc(&identval, op, exprval)) return FALSE; } - buf = (LPTSTR)alloca ( 32 * sizeof(TCHAR) ); - _sntprintf ( buf, 32, _T("%i"), identval ); - SetEnvironmentVariable ( ident, buf ); // TODO FIXME - check return value + + buf = (LPTSTR)alloca(32 * sizeof(TCHAR)); + _sntprintf(buf, 32, _T("%i"), identval); + SetEnvironmentVariable(ident, buf); // TODO FIXME - check return value exprval = identval; } else { - /* restore p in case we found an ident but not an op */ + /* Restore p in case we found an identifier but not an operator */ p = *p_; - if ( !seta_expr ( &p, &exprval ) ) + if (!seta_expr(&p, &exprval)) return FALSE; } @@ -517,13 +544,15 @@ seta_stmt(LPCTSTR* p_, INT* result) LPCTSTR p = *p_; INT rval; - if ( !seta_assignment ( &p, &rval ) ) + if (!seta_assignment(&p, &rval)) return FALSE; - while ( *p == _T(',') ) + + /* Loop over each statement */ + while (*p == _T(',')) { - p = skip_ws ( p+1 ); + p = skip_ws(p + 1); - if ( !seta_assignment ( &p, &rval ) ) + if (!seta_assignment(&p, &rval)) return FALSE; } @@ -536,15 +565,19 @@ static BOOL seta_eval(LPCTSTR p) { INT rval; - if ( !*p ) + + if (!*p) { - ConErrResPuts ( STRING_SYNTAX_COMMAND_INCORRECT ); + ConErrResPuts(STRING_SYNTAX_COMMAND_INCORRECT); return FALSE; } - if ( !seta_stmt ( &p, &rval ) ) + if (!seta_stmt(&p, &rval)) return FALSE; - if ( !bc ) - ConOutPrintf ( _T("%i"), rval ); + + /* Echo the result of the evaluation only in interactive (non-batch) mode */ + if (!bc) + ConOutPrintf(_T("%i"), rval); + return TRUE; }

1 0

[reactos] 25/48: [CMD] Fix the implementation of EXIT /B when a batch context is active.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82bcb3f9f035f96ea1706… commit 82bcb3f9f035f96ea1706b0a755ac3d5c9ace234 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 7 02:13:27 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:03 2020 +0200 [CMD] Fix the implementation of EXIT /B when a batch context is active. --- base/shell/cmd/internal.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 175f4b452a7..b81e6cb5645 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -509,8 +509,12 @@ INT cmd_rmdir (LPTSTR param) /* - * set the exitflag to true + * Either exits the command interpreter, or quits the current batch context. */ + +/* Enable this define for supporting EXIT /B even when extensions are disabled */ +// #define SUPPORT_EXIT_B_NO_EXTENSIONS + INT CommandExit(LPTSTR param) { if (!_tcsncmp(param, _T("/?"), 2)) @@ -522,7 +526,7 @@ INT CommandExit(LPTSTR param) return 0; } - if (_tcsnicmp(param, _T("/b"), 2) == 0) + if (_tcsnicmp(param, _T("/B"), 2) == 0) { param += 2; @@ -532,8 +536,29 @@ INT CommandExit(LPTSTR param) */ if (bc) { - bc->current = NULL; - ExitBatch(); + /* Windows' CMD compatibility: Use GOTO :EOF */ + TCHAR EofLabel[] = _T(":EOF"); + +#ifdef SUPPORT_EXIT_B_NO_EXTENSIONS + /* + * Temporarily enable extensions so as to support :EOF. + * + * Our GOTO implementation ensures that, when extensions are + * enabled and the label is ':EOF', no immediate change of batch + * context (done e.g. via ExitBatch() calls) is performed. + * This will therefore ensure that we do not spoil the extensions + * state when we restore it below. + */ + BOOL bOldEnableExtensions = bEnableExtensions; + bEnableExtensions = TRUE; +#endif + + cmd_goto(EofLabel); + +#ifdef SUPPORT_EXIT_B_NO_EXTENSIONS + /* Restore the original state of the extensions */ + bEnableExtensions = bOldEnableExtensions; +#endif } else {

1 0

[reactos] 24/48: [CMD] Additional fixes for ERRORLEVEL and last returned exit code from EXIT, CALL commands and CMD. CORE-10495 CORE-13672
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d78e8029b8b499d00776c… commit d78e8029b8b499d00776c54dd30a95b0afbd285a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 30 01:44:43 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:03 2020 +0200 [CMD] Additional fixes for ERRORLEVEL and last returned exit code from EXIT, CALL commands and CMD. CORE-10495 CORE-13672 - Fix how the ERRORLEVEL and the last returned exit code are set by EXIT and CALL commands, when batch contexts terminate, and when CMD runs in single-command mode (with /C). Addendum to commit 26ff2c8e, and reverts commit 7bd33ac4. See also commit 8cf11060 (r40474). More information can be found at: https://ss64.com/nt/exit.html https://stackoverflow.com/a/34987886/13530036 https://stackoverflow.com/a/34937706/13530036 - Move the actual execution of the CMD command-line (in /C or /K single-command mode) from Initialize() to _tmain(), to put it on par with the ProcessInput() interactive mode. - Make ProcessInput() also return the last command's exit code. --- base/shell/cmd/batch.c | 12 +++---- base/shell/cmd/call.c | 7 +++- base/shell/cmd/cmd.c | 82 +++++++++++++++++++++++++++++------------------ base/shell/cmd/internal.c | 7 ++-- 4 files changed, 68 insertions(+), 40 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 184911c60a6..a7dfa2fd11a 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -349,7 +349,7 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) /* Check if this is a "CALL :label" */ if (*firstword == _T(':')) - cmd_goto(firstword); + ret = cmd_goto(firstword); /* If we are calling from inside a FOR, hide the FOR variables */ saved_fc = fc; @@ -376,6 +376,7 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) } /* Stop all execution */ ExitAllBatches(); + ret = 1; break; } @@ -386,12 +387,11 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) FreeCommand(Cmd); } - /* Always return the current errorlevel */ - ret = nErrorLevel; - - TRACE("Batch: returns TRUE\n"); - + /* Restore the FOR variables */ fc = saved_fc; + + /* Always return the last command's return code */ + TRACE("Batch: returns %d\n", ret); return ret; } diff --git a/base/shell/cmd/call.c b/base/shell/cmd/call.c index 2cf2772c3c4..55f39d086f1 100644 --- a/base/shell/cmd/call.c +++ b/base/shell/cmd/call.c @@ -69,10 +69,15 @@ INT cmd_call(LPTSTR param) if (*first == _T(':') && bc) { + INT ret; + /* CALL :label - call a subroutine of the current batch file */ while (*param == _T(' ')) param++; - nErrorLevel = Batch(bc->BatchFilePath, first, param, NULL); + + ret = Batch(bc->BatchFilePath, first, param, NULL); + nErrorLevel = (ret != 0 ? ret : nErrorLevel); + return nErrorLevel; } diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 31910e9e2ef..4bbffa9faf1 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -154,6 +154,7 @@ BOOL bCanExit = TRUE; /* Indicates if this shell is exitable */ BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ static BOOL fSingleCommand = 0; /* When we are executing something passed on the command line after /C or /K */ +static BOOL bAlwaysStrip = FALSE; INT nErrorLevel = 0; /* Errorlevel of last launched external program */ CRITICAL_SECTION ChildProcessRunningLock; BOOL bDisableBatchEcho = FALSE; @@ -631,12 +632,17 @@ DoCommand(LPTSTR first, LPTSTR rest, PARSED_COMMAND *Cmd) INT ParseCommandLine(LPTSTR cmd) { INT Ret = 0; - PARSED_COMMAND *Cmd = ParseCommand(cmd); - if (Cmd) + PARSED_COMMAND *Cmd; + + Cmd = ParseCommand(cmd); + if (!Cmd) { - Ret = ExecuteCommand(Cmd); - FreeCommand(Cmd); + /* Return an adequate error code */ + return (!bParseError ? 0 : 1); } + + Ret = ExecuteCommand(Cmd); + FreeCommand(Cmd); return Ret; } @@ -1524,9 +1530,10 @@ ReadLine(TCHAR *commandline, BOOL bMore) return SubstituteVars(ip, commandline, _T('%')); } -static VOID +static INT ProcessInput(VOID) { + INT Ret = 0; PARSED_COMMAND *Cmd; while (!bCanExit || !bExit) @@ -1538,9 +1545,11 @@ ProcessInput(VOID) if (!Cmd) continue; - ExecuteCommand(Cmd); + Ret = ExecuteCommand(Cmd); FreeCommand(Cmd); } + + return Ret; } @@ -1879,20 +1888,18 @@ GetCmdLineCommand( /* - * Set up global initializations and process parameters + * Set up global initializations and process parameters. + * Return a pointer to the command line if present. */ -static VOID +static LPCTSTR Initialize(VOID) { HMODULE NtDllModule; - // INT nExitCode; HANDLE hIn, hOut; LPTSTR ptr, cmdLine; TCHAR option = 0; - BOOL AlwaysStrip = FALSE; BOOL AutoRun = TRUE; TCHAR ModuleName[MAX_PATH + 1]; - TCHAR commandline[CMDLINE_LENGTH]; /* Get version information */ InitOSVersion(); @@ -1957,7 +1964,7 @@ Initialize(VOID) ConOutResPaging(TRUE, STRING_CMD_HELP8); nErrorLevel = 1; bExit = TRUE; - return; + return NULL; } else if (option == _T('P')) { @@ -1996,7 +2003,7 @@ Initialize(VOID) } else if (option == _T('S')) { - AlwaysStrip = TRUE; + bAlwaysStrip = TRUE; } #ifdef INCLUDE_CMD_COLOR else if (!_tcsnicmp(ptr, _T("/T:"), 3)) @@ -2067,18 +2074,8 @@ Initialize(VOID) ExecuteAutoRunFile(HKEY_CURRENT_USER); } - if (*ptr) - { - /* Do the /C or /K command */ - GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); - /* nExitCode = */ ParseCommandLine(commandline); - if (fSingleCommand == 1) - { - // nErrorLevel = nExitCode; - bExit = TRUE; - } - fSingleCommand = 0; - } + /* Returns the rest of the command line */ + return ptr; } @@ -2125,6 +2122,8 @@ static VOID Cleanup(VOID) */ int _tmain(int argc, const TCHAR *argv[]) { + INT nExitCode; + LPCTSTR pCmdLine; TCHAR startPath[MAX_PATH]; InitializeCriticalSection(&ChildProcessRunningLock); @@ -2144,18 +2143,39 @@ int _tmain(int argc, const TCHAR *argv[]) CMD_ModuleHandle = GetModuleHandle(NULL); - /* Perform general initialization, parse switches on command-line */ - Initialize(); + /* + * Perform general initialization, parse switches on command-line. + * Initialize the exit code with the errorlevel as Initialize() can set it. + */ + pCmdLine = Initialize(); + nExitCode = nErrorLevel; - /* Call prompt routine */ - ProcessInput(); + if (pCmdLine && *pCmdLine) + { + TCHAR commandline[CMDLINE_LENGTH]; + + /* Do the /C or /K command */ + GetCmdLineCommand(commandline, &pCmdLine[2], bAlwaysStrip); + nExitCode = ParseCommandLine(commandline); + if (fSingleCommand == 1) + { + // nErrorLevel = nExitCode; + bExit = TRUE; + } + fSingleCommand = 0; + } + if (!bExit) + { + /* Call prompt routine */ + nExitCode = ProcessInput(); + } /* Do the cleanup */ Cleanup(); cmd_free(lpOriginalEnvironment); - cmd_exit(nErrorLevel); - return nErrorLevel; + cmd_exit(nExitCode); + return nExitCode; } /* EOF */ diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 9febc003cdc..175f4b452a7 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -548,13 +548,16 @@ INT CommandExit(LPTSTR param) /* Search for an optional exit code */ while (_istspace(*param)) - param++; + ++param; /* Set the errorlevel to the exit code */ if (_istdigit(*param)) + { nErrorLevel = _ttoi(param); + // if (fSingleCommand == 1) return nErrorLevel; + } - return 0; + return (bExit ? nErrorLevel : 0); } #ifdef INCLUDE_CMD_REM

1 0

[reactos] 23/48: [CMD_ROSTEST] Add tests for EXIT and CMD returned exit code values. CORE-10495 CORE-13672
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c9d322c688054b74760c… commit 4c9d322c688054b74760cde38fc431589a6408f4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 29 22:31:23 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:02 2020 +0200 [CMD_ROSTEST] Add tests for EXIT and CMD returned exit code values. CORE-10495 CORE-13672 See also commits 8cf11060 (r40474), 26ff2c8e and 7bd33ac4. More information can be also found at: https://stackoverflow.com/a/34987886/13530036 and https://stackoverflow.com/a/34937706/13530036 --- modules/rostests/win32/cmd/test_builtins.cmd | 328 ++++++++++++++++++++++- modules/rostests/win32/cmd/test_builtins.cmd.exp | 64 ++++- 2 files changed, 390 insertions(+), 2 deletions(-) diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd index dd4e1af9eab..9d03f175dc6 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -1,5 +1,9 @@ @echo off +:: +:: Some basic tests +:: + echo ------------ Testing FOR loop ------------ echo --- Multiple lines for %%i in (A @@ -45,4 +49,326 @@ ver | find "Ver" > NUL || echo TRUE OR condition ver | find "1234" > NUL || echo FALSE OR condition -echo ------------- End of Testing ------------- + +:: +:: Testing CMD exit codes and errorlevels. +:: +:: Observations: +:: - OR operator || converts the LHS error code to ERRORLEVEL only on failure; +:: - Pipe operator | converts the last error code to ERRORLEVEL. +:: +:: See https://stackoverflow.com/a/34987886/13530036 +:: and https://stackoverflow.com/a/34937706/13530036 +:: for more details. +:: +setlocal enableextensions + +echo ---------- Testing CMD exit codes and errorlevels ---------- + +:: Tests for CMD returned exit code. + +echo --- CMD /C Direct EXIT call + +call :setError 0 +cmd /c "exit 42" +call :checkErrorLevel 42 + +call :setError 111 +cmd /c "exit 42" +call :checkErrorLevel 42 + +echo --- CMD /C Direct EXIT /B call + +call :setError 0 +cmd /c "exit /b 42" +call :checkErrorLevel 42 + +call :setError 111 +cmd /c "exit /b 42" +call :checkErrorLevel 42 + +:: Non-existing ccommand, or command that only changes +:: the returned code (but NOT the ERRORLEVEL) and EXIT. + +echo --- CMD /C Non-existing command + +:: EXIT alone does not change the ERRORLEVEL +call :setError 0 +cmd /c "nonexisting & exit" +call :checkErrorLevel 9009 + +call :setError 111 +cmd /c "nonexisting & exit" +call :checkErrorLevel 9009 + +call :setError 0 +cmd /c "nonexisting & exit /b" +call :checkErrorLevel 9009 + +call :setError 111 +cmd /c "nonexisting & exit /b" +call :checkErrorLevel 9009 + +echo --- CMD /C RMDIR (no ERRORLEVEL set) + +call :setError 0 +cmd /c "rmdir nonexisting & exit" +call :checkErrorLevel 0 + +call :setError 111 +cmd /c "rmdir nonexisting & exit" +call :checkErrorLevel 0 + +call :setError 0 +cmd /c "rmdir nonexisting & exit /b" +call :checkErrorLevel 0 + +call :setError 111 +cmd /c "rmdir nonexisting & exit /b" +call :checkErrorLevel 0 + +:: Failing command (sets ERRORLEVEL to 1) and EXIT +echo --- CMD /C DIR (sets ERRORLEVEL) - With failure + +:: EXIT alone does not change the ERRORLEVEL +call :setError 0 +cmd /c "dir nonexisting>NUL & exit" +call :checkErrorLevel 1 + +call :setError 111 +cmd /c "dir nonexisting>NUL & exit" +call :checkErrorLevel 1 + +call :setError 0 +cmd /c "dir nonexisting>NUL & exit /b" +call :checkErrorLevel 1 + +call :setError 111 +cmd /c "dir nonexisting>NUL & exit /b" +call :checkErrorLevel 1 + +:: Here EXIT changes the ERRORLEVEL +call :setError 0 +cmd /c "dir nonexisting>NUL & exit 42" +call :checkErrorLevel 42 + +call :setError 111 +cmd /c "dir nonexisting>NUL & exit 42" +call :checkErrorLevel 42 + +call :setError 0 +cmd /c "dir nonexisting>NUL & exit /b 42" +call :checkErrorLevel 42 + +call :setError 111 +cmd /c "dir nonexisting>NUL & exit /b 42" +call :checkErrorLevel 42 + +:: Succeeding command (sets ERRORLEVEL to 0) and EXIT +echo --- CMD /C DIR (sets ERRORLEVEL) - With success + +call :setError 0 +cmd /c "dir>NUL & exit" +call :checkErrorLevel 0 + +call :setError 111 +cmd /c "dir>NUL & exit" +call :checkErrorLevel 0 + +call :setError 0 +cmd /c "dir>NUL & exit 42" +call :checkErrorLevel 42 + +call :setError 111 +cmd /c "dir>NUL & exit 42" +call :checkErrorLevel 42 + +call :setError 0 +cmd /c "dir>NUL & exit /b 42" +call :checkErrorLevel 42 + +call :setError 111 +cmd /c "dir>NUL & exit /b 42" +call :checkErrorLevel 42 + + +:: Same sorts of tests, but now from within an external batch file: +:: Tests for CALL command returned exit code. + +:: Use an auxiliary CMD file +mkdir foobar && cd foobar + +:: Non-existing ccommand, or command that only changes +:: the returned code (but NOT the ERRORLEVEL) and EXIT. + +echo --- CALL Batch Non-existing command + +:: EXIT alone does not change the ERRORLEVEL +echo nonexisting ^& exit /b> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 9009 + +echo nonexisting ^& exit /b> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 9009 + +:: These tests show that || converts the returned error code +:: from RMDIR on failure, and converts it to an ERRORLEVEL +:: (first two tests: no ||, thus no ERRORLEVEL set; +:: last two tests: ||used and ERRORLEVEL is set). +:: + +echo --- CALL Batch RMDIR (no ERRORLEVEL set) + +:: This test shows that if a batch returns error code 0 from CALL, +:: then CALL will keep the existing ERRORLEVEL (here, 111)... +echo rmdir nonexisting> tmp.cmd +echo exit /b>> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 0 + +echo rmdir nonexisting> tmp.cmd +echo exit /b>> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 111 + +echo --- CALL Batch RMDIR with ^|^| (sets ERRORLEVEL) + +:: ... but if a non-zero error code is returned from CALL, +:: then CALL uses it as the new ERRORLEVEL. +echo rmdir nonexisting ^|^| rem> tmp.cmd +echo exit /b>> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 2 +:: This gives the same effect, since the last command's error code +:: is returned and transformed by CALL into an ERRORLEVEL: +echo rmdir nonexisting> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 2 + +echo rmdir nonexisting ^|^| rem> tmp.cmd +echo exit /b>> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 2 +:: This gives the same effect, since the last command's error code +:: is returned and transformed by CALL into an ERRORLEVEL: +echo rmdir nonexisting> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 2 + + +:: Failing command (sets ERRORLEVEL to 1) and EXIT +echo --- CALL Batch DIR (sets ERRORLEVEL) - With failure + +echo dir nonexisting^>NUL> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 1 + +echo dir nonexisting^>NUL> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 1 + +echo dir nonexisting^>NUL ^& goto :eof> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 1 + +echo dir nonexisting^>NUL ^& goto :eof> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 1 + +echo dir nonexisting^>NUL ^& exit /b> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 1 + +echo dir nonexisting^>NUL ^& exit /b> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 1 + +echo dir nonexisting^>NUL ^& exit /b 42 > tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 42 + +echo dir nonexisting^>NUL ^& exit /b 42 > tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 42 + +:: Succeeding command (sets ERRORLEVEL to 0) and EXIT +echo --- CALL Batch DIR (sets ERRORLEVEL) - With success + +echo dir^>NUL> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 0 + +echo dir^>NUL> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 0 + +echo dir^>NUL ^& goto :eof> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 0 + +echo dir^>NUL ^& goto :eof> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 0 + +echo dir^>NUL ^& exit /b> tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 0 + +echo dir^>NUL ^& exit /b> tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 0 + +echo dir^>NUL ^& exit /b 42 > tmp.cmd +call :setError 0 +call tmp.cmd +call :checkErrorLevel 42 + +echo dir^>NUL ^& exit /b 42 > tmp.cmd +call :setError 111 +call tmp.cmd +call :checkErrorLevel 42 + + +:: Cleanup +del tmp.cmd +cd .. & rmdir /s/q foobar + + +:: +:: Finished! +:: +echo --------- Finished -------------- +goto :EOF + +:checkErrorLevel +if %errorlevel% neq %1 (echo Unexpected errorlevel %errorlevel%, expected %1) else echo OK +goto :eof + +:: Subroutine to set errorlevel and return +:: in windows nt 4.0, this always sets errorlevel 1, since /b isn't supported +:setError +exit /B %1 +:: This line runs under cmd in windows NT 4, but not in more modern versions. diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp index 43f4a6b5b30..e2d609e8e03 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd.exp +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -23,4 +23,66 @@ I TRUE AND condition ---------- Testing OR operator ----------- FALSE OR condition -------------- End of Testing ------------- +---------- Testing CMD exit codes and errorlevels ---------- +--- CMD /C Direct EXIT call +OK +OK +--- CMD /C Direct EXIT /B call +OK +OK +--- CMD /C Non-existing command +OK +OK +OK +OK +--- CMD /C RMDIR (no ERRORLEVEL set) +OK +OK +OK +OK +--- CMD /C DIR (sets ERRORLEVEL) - With failure +OK +OK +OK +OK +OK +OK +OK +OK +--- CMD /C DIR (sets ERRORLEVEL) - With success +OK +OK +OK +OK +OK +OK +--- CALL Batch Non-existing command +OK +OK +--- CALL Batch RMDIR (no ERRORLEVEL set) +OK +OK +--- CALL Batch RMDIR with || (sets ERRORLEVEL) +OK +OK +OK +OK +--- CALL Batch DIR (sets ERRORLEVEL) - With failure +OK +OK +OK +OK +OK +OK +OK +OK +--- CALL Batch DIR (sets ERRORLEVEL) - With success +OK +OK +OK +OK +OK +OK +OK +OK +--------- Finished --------------

1 0

[reactos] 22/48: [CMD] GOTO: Fix label parsing.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e4c8c019ebe5d78dbcf4… commit 2e4c8c019ebe5d78dbcf4397ffa0caa4eabb5d0d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 22 01:16:53 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:01 2020 +0200 [CMD] GOTO: Fix label parsing. We note two things, when CMD searches for the corresponding label in the batch file: - the first character of the line is always ignored, unless it's a colon; - the escape caret ^ is supported and interpreted. Fixes some cmd_winetests. --- base/shell/cmd/batch.c | 4 +- base/shell/cmd/cmd.h | 4 ++ base/shell/cmd/goto.c | 97 ++++++++++++++++++++++++++++++++++--------------- base/shell/cmd/parser.c | 3 -- 4 files changed, 74 insertions(+), 34 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index a5c31aece09..184911c60a6 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -131,7 +131,7 @@ static LPTSTR BatchParams(LPTSTR s1, LPTSTR s2) BOOL inquotes = FALSE; /* Find next parameter */ - while (_istspace(*s2) || (*s2 && _tcschr(_T(",;="), *s2))) + while (_istspace(*s2) || (*s2 && _tcschr(STANDARD_SEPS, *s2))) s2++; if (!*s2) break; @@ -139,7 +139,7 @@ static LPTSTR BatchParams(LPTSTR s1, LPTSTR s2) /* Copy it */ do { - if (!inquotes && (_istspace(*s2) || _tcschr(_T(",;="), *s2))) + if (!inquotes && (_istspace(*s2) || _tcschr(STANDARD_SEPS, *s2))) break; inquotes ^= (*s2 == _T('"')); *s1++ = *s2++; diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index a6e780bdc6e..f547389024e 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -301,6 +301,10 @@ INT cmd_move (LPTSTR); INT CommandMsgbox (LPTSTR); /* Prototypes from PARSER.C */ + +/* These three characters act like spaces to the parser in most contexts */ +#define STANDARD_SEPS _T(",;=") + enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_OR, C_AND, C_PIPE, C_IF, C_FOR }; typedef struct _PARSED_COMMAND { diff --git a/base/shell/cmd/goto.c b/base/shell/cmd/goto.c index 5831b25e22f..5174b62417f 100644 --- a/base/shell/cmd/goto.c +++ b/base/shell/cmd/goto.c @@ -35,7 +35,7 @@ */ INT cmd_goto(LPTSTR param) { - LPTSTR tmp, tmp2; + LPTSTR label, tmp; DWORD dwCurrPos; BOOL bRetry; @@ -59,11 +59,9 @@ INT cmd_goto(LPTSTR param) return 1; } - /* Terminate label at first space char */ - tmp = param + 1; - while (!_istcntrl(*tmp) && !_istspace(*tmp) && (*tmp != _T(':'))) - ++tmp; - *tmp = _T('\0'); + /* Strip leading whitespace */ + while (_istspace(*param)) + ++param; /* Support jumping to the end of the file, only if extensions are enabled */ if (bEnableExtensions && @@ -78,6 +76,23 @@ INT cmd_goto(LPTSTR param) return 0; } + /* Skip the first colon or plus sign */ + if (*param == _T(':') || *param == _T('+')) + ++param; + /* Terminate the label at the first delimiter character */ + tmp = param; + while (!_istcntrl(*tmp) && !_istspace(*tmp) && + !_tcschr(_T(":+"), *tmp) && !_tcschr(STANDARD_SEPS, *tmp) /* && + !_tcschr(_T("&|<>"), *tmp) */) + { + ++tmp; + } + *tmp = _T('\0'); + + /* If we don't have any label, bail out */ + if (!*param) + goto NotFound; + /* * Search the next label starting our position, until the end of the file. * If none has been found, restart at the beginning of the file, and continue @@ -89,36 +104,59 @@ INT cmd_goto(LPTSTR param) retry: while (BatchGetString(textline, ARRAYSIZE(textline))) { - INT pos; - INT_PTR size; - if (bRetry && (bc->mempos >= dwCurrPos)) break; - /* Strip out any trailing spaces or control chars */ - tmp = textline + _tcslen(textline) - 1; - while (tmp > textline && (_istcntrl(*tmp) || _istspace(*tmp) || (*tmp == _T(':')))) - --tmp; - *(tmp + 1) = _T('\0'); +#if 0 + /* If this is not a label, continue searching */ + if (!_tcschr(textline, _T(':'))) + continue; +#endif + + label = textline; + + /* A bug in Windows' CMD makes it always ignore the + * first character of the line, unless it's a colon. */ + if (*label != _T(':')) + ++label; + + /* Strip any leading whitespace */ + while (_istspace(*label)) + ++label; + + /* If this is not a label, continue searching */ + if (*label != _T(':')) + continue; + + /* Skip the first colon or plus sign */ +#if 0 + if (*label == _T(':') || *label == _T('+')) + ++label; +#endif + ++label; + /* Strip any whitespace between the colon and the label */ + while (_istspace(*label)) + ++label; + /* Terminate the label at the first delimiter character */ + tmp = label; + while (!_istcntrl(*tmp) && !_istspace(*tmp) && + !_tcschr(_T(":+"), *tmp) && !_tcschr(STANDARD_SEPS, *tmp) && + !_tcschr(_T("&|<>"), *tmp)) + { + /* Support the escape caret */ + if (*tmp == _T('^')) + { + /* Move the buffer back one character */ + memmove(tmp, tmp + 1, (_tcslen(tmp + 1) + 1) * sizeof(TCHAR)); + /* We will ignore the new character */ + } - /* Then leading spaces... */ - tmp = textline; - while (_istspace(*tmp)) ++tmp; - - /* All space after leading space terminate the string */ - size = _tcslen(tmp) - 1; - pos = 0; - while (tmp + pos < tmp + size) - { - if (_istspace(tmp[pos])) - tmp[pos]=_T('\0'); - ++pos; } + *tmp = _T('\0'); - tmp2 = param; - /* Use whole label name */ - if ((*tmp == _T(':')) && ((_tcsicmp(++tmp, param) == 0) || (_tcsicmp(tmp, ++tmp2) == 0))) + /* Jump if the labels are identical */ + if (_tcsicmp(label, param) == 0) { /* Do not process any more parts of a compound command */ bc->current = NULL; @@ -132,6 +170,7 @@ retry: goto retry; } +NotFound: ConErrResPrintf(STRING_GOTO_ERROR2, param); ExitBatch(); return 1; diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index e25b63aa91b..20310c77830 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -39,9 +39,6 @@ static const TCHAR *const IfOperatorString[] = #define IF_MAX_COMPARISON IF_NEQ }; -/* These three characters act like spaces to the parser in most contexts */ -#define STANDARD_SEPS _T(",;=") - static BOOL IsSeparator(TCHAR Char) { return _istspace(Char) || (Char && _tcschr(STANDARD_SEPS, Char));

1 0

[reactos] 21/48: [CMD_ROSTEST] Add tests for GOTO label parsing.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71cd64d66a20e91af4cf1… commit 71cd64d66a20e91af4cf1b702607f9ff8e79bf91 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 01:11:23 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:01 2020 +0200 [CMD_ROSTEST] Add tests for GOTO label parsing. --- modules/rostests/win32/cmd/test_goto_call.cmd | 65 +++++++++++++++++++++-- modules/rostests/win32/cmd/test_goto_call.cmd.exp | 7 +++ 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/modules/rostests/win32/cmd/test_goto_call.cmd b/modules/rostests/win32/cmd/test_goto_call.cmd index 6a8d3579bc5..d2356a1b447 100644 --- a/modules/rostests/win32/cmd/test_goto_call.cmd +++ b/modules/rostests/win32/cmd/test_goto_call.cmd @@ -11,8 +11,9 @@ setlocal enabledelayedexpansion :: GOTO/CALL jump to labels present forward to their call-point. Only when :: the label cannot be found forward, the search is then restarted from the :: beginning of the batch file onwards up to the original call-point. -:: -goto :test_start + +:: GOTO with a label parameter without ':' works. +goto test_start :: Execution must never go there! :test_goto @@ -36,7 +37,8 @@ goto :continue :test_goto echo Test GOTO ok -goto :do_test_call +:: GOTO also understands '+' instead of ':' in its label parameter. +goto +do_test_call :test_call echo Test CALL ok from %0 @@ -44,12 +46,69 @@ echo Test CALL ok from %0 goto :EOF +:: +:: Next suite of tests. +:: + +:: GOTO label search algorithm ignores any whitespace between ':' +:: and the label name, as well as leading and trailing whitespace. + :@tab@continue@space@@space@ + + +:: Jumping to a label with escape carets. +goto :la^^bel2 + +:la^bel2 +echo Unexpected GOTO jump^^! +:la^^bel2 +echo GOTO with escape caret worked + + +:: Go to the next tests below. +goto :continue + + :: :: Next suite of tests. :: :continue +:: +:: Extra GOTO syntax checks: separators in the label parameter +:: + +:: Whitespace +goto :testLbl1@tab@ignored +:testLbl1 +echo Hi there^^! + +:: Colon +goto :testLbl2:ignored +:testLbl2 +echo Hi there^^! + +:: Plus sign +goto :testLbl3+ignored +:testLbl3 +echo Hi there^^! + +:: Comma +goto :testLbl4,ignored +:testLbl4 +echo Hi there^^! + +:: Semicolon +goto :testLbl5;ignored +:testLbl5 +echo Hi there^^! + +:: Equals +goto :testLbl6;ignored +:testLbl6 +echo Hi there^^! + + :: :: Testing :EOF support :: diff --git a/modules/rostests/win32/cmd/test_goto_call.cmd.exp b/modules/rostests/win32/cmd/test_goto_call.cmd.exp index f375908a87b..3e94300fd76 100644 --- a/modules/rostests/win32/cmd/test_goto_call.cmd.exp +++ b/modules/rostests/win32/cmd/test_goto_call.cmd.exp @@ -2,6 +2,13 @@ Test GOTO ok --------- Testing CALL within batch --------- Test CALL ok from :test_call +GOTO with escape caret worked +Hi there! +Hi there! +Hi there! +Hi there! +Hi there! +Hi there! --------- Testing :EOF support --------- OK OK

1 0

[reactos] 20/48: [CMD] GOTO: Fix handling of the ':EOF' label handling.
by Hermès Bélusca-Maïto 19 Aug '20

19 Aug '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5e6e5a19c38795162992… commit c5e6e5a19c38795162992b3403542d3d67e4c38a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 12 17:53:20 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 19 20:36:01 2020 +0200 [CMD] GOTO: Fix handling of the ':EOF' label handling. - The ':EOF' label feature is available only when extensions are enabled. - Anything that follows the ':EOF' label, separated by at least one whitespace character, is ignored, and the batch file terminates. --- base/shell/cmd/goto.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/base/shell/cmd/goto.c b/base/shell/cmd/goto.c index 585a9708072..5831b25e22f 100644 --- a/base/shell/cmd/goto.c +++ b/base/shell/cmd/goto.c @@ -65,8 +65,10 @@ INT cmd_goto(LPTSTR param) ++tmp; *tmp = _T('\0'); - /* jump to end of the file */ - if ( _tcsicmp( param, _T(":eof"))==0) + /* Support jumping to the end of the file, only if extensions are enabled */ + if (bEnableExtensions && + (_tcsnicmp(param, _T(":EOF"), 4) == 0) && + (!param[4] || _istspace(param[4]))) { /* Position at the end of the batch file */ bc->mempos = bc->memsize;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs