Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[dreimer] 59394: Add Alter's DVD Write Now software to rapps. It includes a UDF filesystem driver. Working: Access to UDF disks with software (Windows DVDs) and Video DVDs. Not working: Video BluRa...

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Jun 30 14:53:00 2013 New Revision: 59394 URL: http://svn.reactos.org/svn/reactos?rev=59394&view=rev Log: Add Alter's DVD Write Now software to rapps. It includes a UDF filesystem driver. Working: Access to UDF disks with software (Windows DVDs) and Video DVDs. Not working: Video BluRays (UDF 2.50 not supported by the driver), USB sticks. Untested: Rest Added: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt [iso-8859-1] Sun Jun 30 14:53:00 2013 @@ -0,0 +1,14 @@ +ï»¿; UTF-8 + +[Section] +Name = DVD Write Now +Version = 1.5.12 sp2 +Licence = Freeware +Description = A free direct CD/DVD recording software. Once installed, you can use your CD/DVD RW as USB Flash or removable hard drives. Along with this you can write to CD/DVD RW recorded with UDF filesystem. You can also read UDF disks created with other software. (Microsoft DVDâROMs, RW disks recorded with Ahead InCD). You need a ZIP decompression program to install it. +Size = 1.2MB +Category = 13 +URLDownload = http://dwn.alter.org.ua/downloads/dwn_1_5_12_sp2.zip +CDPath = none + +[Section.0407] +Description = Eine kostenlose CD/DVD Brennsoftware. Sobald es installiert ist, kann man CD/DVD RW als USB Flash oder WechseldatentrÃ¤ger beschreiben. Auch kann man hiermit auf CD/DVD RW schreiben, welche mit dem UDF Dateisystem beschrieben wurden. Auch kann man mit dieser Software UDF Disks, welche mit anderer Software erstellt wurden, lesen. (Microsoft DVDâROMs, RW Disks erstellt mit Ahead InCD). Es wird fÃ¼r die Installation ein ZIP Dekomprimierprogramm benÃ¶tigt. Propchange: trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 5 months

[hbelusca] 59393: [CMD] Give help for the "help" command.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 30 14:09:38 2013 New Revision: 59393 URL: http://svn.reactos.org/svn/reactos?rev=59393&view=rev Log: [CMD] Give help for the "help" command. Modified: trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -245,7 +245,7 @@ }; -VOID PrintCommandList (VOID) +VOID PrintCommandList(VOID) { LPCOMMAND cmdptr; INT y; @@ -258,7 +258,7 @@ { if (++y == 8) { - ConOutPuts (cmdptr->name); + ConOutPuts(cmdptr->name); y = 0; } else @@ -271,13 +271,13 @@ } if (y != 0) - ConOutChar ('\n'); + ConOutChar('\n'); } -VOID PrintCommandListDetail (VOID) +VOID PrintCommandListDetail(VOID) { - ConOutResPaging(TRUE,STRING_HELP1); - ConOutResPaging(FALSE,STRING_HELP2); + ConOutResPaging(TRUE , STRING_HELP1); + ConOutResPaging(FALSE, STRING_HELP2); } /* EOF */ Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -543,13 +543,20 @@ INT CommandShowCommands (LPTSTR param) { - PrintCommandList (); + PrintCommandList(); return 0; } -INT CommandShowCommandsDetail (LPTSTR param) -{ - /* If a param was send, display help of correspondent command */ +INT CommandShowCommandsDetail(LPTSTR param) +{ + /* We display help for the help command */ + if (!_tcsncmp(param, _T("/?"), 2)) + { + ConOutResPaging(TRUE, STRING_HELP_HELP1); + return 0; + } + + /* If a param was send, display help of corresponding command */ if (_tcslen(param)) { DoCommand(param, _T("/?"), NULL); @@ -557,7 +564,7 @@ /* Else, display detailed commands list */ else { - PrintCommandListDetail (); + PrintCommandListDetail(); } return 0; } Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -266,6 +266,10 @@ GOTO Marke\n\n\ Marke Definiert eine Zeichenfolge als Marke in einem Batchprogramm.\n\n\ Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Verarbeitet AusdrÃ¼cke in einer Batchdatei abhÃ¤ngig von Bedingungen.\n\n\ IF [NOT] ERRORLEVEL Nummer Befehl\n\ Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -270,6 +270,10 @@ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -270,6 +270,10 @@ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -271,6 +271,10 @@ GOTO etiqueta\n\n\ etiqueta Especifica la cadena de texto usada en el archivo por lotes como etiqueta.\n\n\ Escriba la etiqueta en la linea misma, empezando con dos puntos." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Ejecuta procesos condicionales en archivos por lotes.\n\n\ IF [NOT] ERRORLEVEL nÃºmero comando\n\ Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -285,6 +285,10 @@ GOTO label\n\n\ label SpÃ©cifie un champ texte utilisÃ© dans un script batch comme un label.\n\n\ Vous Ã©crivez un label seul sur une ligne commenÃ§ant par un deux-points.\n" + +STRING_HELP_HELP1, "Fournit des informations d'aide pour les commandes de ReactOS.\n\n\ +HELP [commande]\n\n\ + commande - Affiche des informations d'aide sur cette commande.\n" STRING_IF_HELP1, "ExÃ©cute un traitement conditionnel dans des programmes batch.\n\n\ IF [NOT] ERRORLEVEL nombre commande\n\ Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -255,6 +255,10 @@ GOTO cÃmke\n\n\ cÃmke A megadott cÃmkÃ©re fog ugrani az Ã©rtelmezÃµ.\n\n\ Egy cÃmkÃ©t egy sorban lehet megadni, ':' -tal kezdve." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -271,6 +271,10 @@ GOTO label\n\n\ label Menetapkan string teks yang digunakan dalam naskah batch sebagai label.\n\n\ Anda mengetik label pada sebuah baris, dimulai dengan titik dua." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Melakukan pemrosesan kondisional dalam program batch.\n\n\ IF [NOT] ERRORLEVEL nomor perintah\n\ Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -269,6 +269,10 @@ GOTO etichetta\n\n\ etichetta Indica il testo utilizzato come etichetta in un batch.\n\n\ Nel batch questa deve trovarsi da sola in una linea con davanti due punti :.\n" + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Esegue una elaborazione condizionale nei batch.\n\n\ IF [NOT] ERRORLEVEL numero comando\n\ Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -276,6 +276,10 @@ ã©ãã« ããã ããã°ã©ã ã§ã©ãã«ã¨ãã¦ä½¿ç¨ããããã¹ãæååãæå®ãã¾ãã\n\n\ ã©ãã«ã®åé ã«ã¯ : (ã³ãã³) ãæå®ããã©ãã«ã ããåç¬ã§ 1 è¡ã«å¥åãã¦ãã \n\ ããã" + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "ããã ããã°ã©ã ä¸ã§æ¡ä»¶å¦çãå®è¡ãã¾ãã\n\n\ IF [NOT] ERRORLEVEL çªå· ã³ãã³ã\n\ Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -266,6 +266,10 @@ GOTO merke\n\n\ merke angir en tekst streng brukt i en satsvis skript.\n\n\ Et merke opprettes pÃ¥ egen linje ved Ã¥ skrive kolon fulgt av navn pÃ¥ merke." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "UtfÃ¸re betinget behandling i satsvise programmer.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -274,6 +274,10 @@ GOTO etykieta\n\n\ etykieta CiÄg znakÃ³w, uÅ¼yty w programie wsadowym do oznaczenia linii.\n\n\ MoÅ¼esz oznaczyÄ linie dowolnÄ etykietÄ, zaczynajÄc od dwukropka." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Wykonuje przetwarzanie warunkowe w programach wsadowych.\n\n\ IF [NOT] ERRORLEVEL numer komenda\n\ Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -299,6 +299,10 @@ etichetÄ SpecificÄ un Èir text utilizat ca etichetÄ Ã®n\n\ fiÈierele de comenzi.\n\n\ O etichetÄ se va defini pe un rÃ¢nd Ã®ntreg, Ã®ncepÃ¢nd cu douÄ puncte (:)\n" + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "RealizeazÄ execuÈia condiÈionatÄ a comenzilor Ã®ntr-un fiÈier de comenzi.\n\n\ IF [NOT] ERRORLEVEL numÄr comandÄ\n\ Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -271,6 +271,10 @@ GOTO Ð¼ÐµÑÐºÐ°\n\n\ label Ð¡ÑÑÐ¾ÐºÐ° Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°, Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ðº Ð¼ÐµÑÐºÐ°.\n\n\ ÐÐµÑÐºÐ° Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑÑ Ð² Ð¾ÑÐ´ÐµÐ»ÑÐ½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐµ Ð¸ Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ Ð´Ð²Ð¾ÐµÑÐ¾ÑÐ¸Ñ." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "ÐÐ¿ÐµÑÐ°ÑÐ¾Ñ ÑÑÐ»Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð² Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð¼ ÑÐ°Ð¹Ð»Ðµ.\n\n\ IF [NOT] ERRORLEVEL ÑÐ¸ÑÐ»Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -274,6 +274,10 @@ GOTO label\n\n\ label Specifies a text string used in a batch script as a label.\n\n\ You type a label on a line by itself, beginning with a colon." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -266,6 +266,10 @@ GOTO etikett\n\n\ etikett Anger en text strÃ¤ng anvÃ¤nt i ett batchprogram.\n\n\ En etikett skapas pÃ¥ en egen rad genom att skriva kolon fÃ¶ljt av namn pÃ¥ etiketten." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "UtfÃ¶r villkorsstyrd bearbetning i batchprogram.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -277,6 +277,10 @@ GOTO Ð¼iÑÐºÐ°\n\n\ label ÑÑÐ´Ð¾Ðº Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ, Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐº Ð¼iÑÐºÐ°.\n\n\ ÐÑÑÐºÐ° Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¸ÑÐ¸ÑÑ Ð² Ð¾ÐºÑÐµÐ¼Ð¾Ð¼Ñ ÑÑÐ´ÐºÑ i Ð¿Ð¾ÑÐ¸Ð½Ð°ÑÐ¸ÑÑ Ð· Ð´Ð²Ð¾ÐºÑÐ°Ð¿ÐºÐ¸." + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "ÐÐ¿ÐµÑÐ°ÑÐ¾Ñ ÑÐ¼Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ñ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð¼Ñ ÑÐ°Ð¹Ð»i.\n\n\ IF [NOT] ERRORLEVEL ÑÐ¸ÑÐ»Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -258,6 +258,10 @@ GOTO æ ç¾\n\n\ æ ç¾ å¨æ¹å¤çèæ¬ä¸è¢«ç¨ä½æ ç¾çææ¬åç¬¦ä¸²ã\n\n\ ä½¿ç¨åå·å¼å¤´çä¸è¡å°±ä½ä¸ºä¸ä¸ªæ ç¾ã" + +STRING_HELP_HELP1, "Provides Help information for ReactOS commands.\n\n\ +HELP [command]\n\n\ + command - Display help information for this command.\n" STRING_IF_HELP1, "å¨æ¹å¤çæä»¶ä¸æ§è¡æ¡ä»¶æ§å¶å¤çã\n\n\ IF [NOT] ERRORLEVEL æ°å å½ä»¤\n\ Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sun Jun 30 14:09:38 2013 @@ -137,72 +137,74 @@ #define STRING_GOTO_HELP1 659 -#define STRING_LABEL_HELP1 660 -#define STRING_LABEL_HELP2 661 -#define STRING_LABEL_HELP3 662 -#define STRING_LABEL_HELP4 663 -#define STRING_LABEL_HELP5 664 - -#define STRING_LOCALE_HELP1 665 - -#define STRING_MKDIR_HELP 666 - -#define STRING_MEMMORY_HELP1 667 -#define STRING_MEMMORY_HELP2 668 - -#define STRING_MISC_HELP1 669 - -#define STRING_MOVE_HELP1 670 -#define STRING_MOVE_HELP2 671 - -#define STRING_MSGBOX_HELP 672 - -#define STRING_PATH_HELP1 673 - -#define STRING_PAUSE_HELP1 674 - -#define STRING_PROMPT_HELP1 675 -#define STRING_PROMPT_HELP2 676 -#define STRING_PROMPT_HELP3 677 - -#define STRING_REM_HELP 678 - -#define STRING_REN_HELP1 679 -#define STRING_REN_HELP2 680 -#define STRING_REN_HELP3 681 - -#define STRING_RMDIR_HELP 682 - -#define STRING_SCREEN_HELP 683 - -#define STRING_SHIFT_HELP 684 - -#define STRING_SET_HELP 685 - -#define STRING_START_HELP1 686 - -#define STRING_TITLE_HELP 687 - -#define STRING_TIME_HELP1 688 -#define STRING_TIME_HELP2 689 - -#define STRING_TIMER_HELP1 690 -#define STRING_TIMER_HELP2 691 -#define STRING_TIMER_HELP3 692 - -#define STRING_TYPE_HELP1 693 - -#define STRING_VERIFY_HELP1 694 -#define STRING_VERIFY_HELP2 695 -#define STRING_VERIFY_HELP3 696 - -#define STRING_VERSION_HELP1 697 -#define STRING_VERSION_HELP2 698 -#define STRING_VERSION_HELP3 699 -#define STRING_VERSION_HELP4 700 -#define STRING_VERSION_HELP5 701 -#define STRING_VERSION_HELP6 702 -#define STRING_VERSION_HELP7 703 +#define STRING_HELP_HELP1 660 + +#define STRING_LABEL_HELP1 661 +#define STRING_LABEL_HELP2 662 +#define STRING_LABEL_HELP3 663 +#define STRING_LABEL_HELP4 664 +#define STRING_LABEL_HELP5 665 + +#define STRING_LOCALE_HELP1 666 + +#define STRING_MKDIR_HELP 667 + +#define STRING_MEMMORY_HELP1 668 +#define STRING_MEMMORY_HELP2 669 + +#define STRING_MISC_HELP1 670 + +#define STRING_MOVE_HELP1 671 +#define STRING_MOVE_HELP2 672 + +#define STRING_MSGBOX_HELP 673 + +#define STRING_PATH_HELP1 674 + +#define STRING_PAUSE_HELP1 675 + +#define STRING_PROMPT_HELP1 676 +#define STRING_PROMPT_HELP2 677 +#define STRING_PROMPT_HELP3 678 + +#define STRING_REM_HELP 679 + +#define STRING_REN_HELP1 680 +#define STRING_REN_HELP2 681 +#define STRING_REN_HELP3 682 + +#define STRING_RMDIR_HELP 683 + +#define STRING_SCREEN_HELP 684 + +#define STRING_SHIFT_HELP 685 + +#define STRING_SET_HELP 686 + +#define STRING_START_HELP1 687 + +#define STRING_TITLE_HELP 688 + +#define STRING_TIME_HELP1 689 +#define STRING_TIME_HELP2 690 + +#define STRING_TIMER_HELP1 691 +#define STRING_TIMER_HELP2 692 +#define STRING_TIMER_HELP3 693 + +#define STRING_TYPE_HELP1 694 + +#define STRING_VERIFY_HELP1 695 +#define STRING_VERIFY_HELP2 696 +#define STRING_VERIFY_HELP3 697 + +#define STRING_VERSION_HELP1 698 +#define STRING_VERSION_HELP2 699 +#define STRING_VERSION_HELP3 700 +#define STRING_VERSION_HELP4 701 +#define STRING_VERSION_HELP5 702 +#define STRING_VERSION_HELP6 703 +#define STRING_VERSION_HELP7 704 #define STRING_VERSION_RUNVER 705 #define STRING_VOL_HELP1 706

11 years, 5 months

[spetreolle] 59392: [QUARTZ] Use winetest_interactive to disable tests.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Jun 30 13:59:59 2013 New Revision: 59392 URL: http://svn.reactos.org/svn/reactos?rev=59392&view=rev Log: [QUARTZ] Use winetest_interactive to disable tests. Modified: trunk/rostests/winetests/quartz/dsoundrender.c trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/misc.c trunk/rostests/winetests/quartz/testlist.c trunk/rostests/winetests/quartz/videorenderer.c Modified: trunk/rostests/winetests/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre… ============================================================================== --- trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] Sun Jun 30 13:59:59 2013 @@ -221,6 +221,11 @@ START_TEST(dsoundrender) { +if(!winetest_interactive) +{ + skip("Skipping dsoundrender test, see ROSTESTS_116\n"); + return; +} CoInitialize(NULL); if (!create_dsound_renderer()) return; Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Sun Jun 30 13:59:59 2013 @@ -1846,6 +1846,12 @@ START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); +if(!winetest_interactive) +{ + skip("Skipping filtergraph test, see ROSTESTS_116\n"); + return; +} +else{ test_render_run(avifileA); test_render_run(mpegfileA); test_graph_builder(); @@ -1853,5 +1859,6 @@ test_mediacontrol(); test_filter_graph2(); test_render_filter_priority(); +} CoUninitialize(); } Modified: trunk/rostests/winetests/quartz/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/misc.c?r… ============================================================================== --- trunk/rostests/winetests/quartz/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/misc.c [iso-8859-1] Sun Jun 30 13:59:59 2013 @@ -206,9 +206,15 @@ { CoInitialize(NULL); +if(!winetest_interactive) +{ + skip("Skipping misc test, see ROSTESTS_116\n"); + return; +} +else{ test_video_renderer_aggregations(); test_filter_graph_aggregations(); test_filter_mapper_aggregations(); - +} CoUninitialize(); } Modified: trunk/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist… ============================================================================== --- trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] Sun Jun 30 13:59:59 2013 @@ -18,16 +18,12 @@ const struct test winetest_testlist[] = { { "avisplitter", func_avisplitter }, -#ifdef ROSTESTS_116_FIXED { "dsoundrender", func_dsoundrender }, { "filtergraph", func_filtergraph }, -#endif /* ROSTESTS_116_FIXED */ { "filtermapper", func_filtermapper }, { "memallocator", func_memallocator }, -#ifdef ROSTESTS_116_FIXED { "misc", func_misc }, { "videorenderer", func_videorenderer }, -#endif /* ROSTESTS_116_FIXED */ { "referenceclock", func_referenceclock }, { 0, 0 } }; Modified: trunk/rostests/winetests/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/videoren… ============================================================================== --- trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] Sun Jun 30 13:59:59 2013 @@ -156,9 +156,15 @@ if (!create_video_renderer()) return; +if(!winetest_interactive) +{ + skip("Skipping filtergraph test, see ROSTESTS_116\n"); + return; +} +else{ test_query_interface(); test_basefilter(); - +} release_video_renderer(); CoUninitialize();

11 years, 5 months

[hbelusca] 59391: [CMD] - Remove erratic tabs in language files. - Add the fact that one can use the "help" command with: "help command" to obtain help for "command".

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 30 13:49:54 2013 New Revision: 59391 URL: http://svn.reactos.org/svn/reactos?rev=59391&view=rev Log: [CMD] - Remove erratic tabs in language files. - Add the fact that one can use the "help" command with: "help command" to obtain help for "command". Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -89,12 +89,12 @@ STRING_CMD_HELP8, "Startet eine neue Instanz des ReactOS-Befehlsinterpreters.\n\n\ CMD [/[C|K] Befehl][/P][/Q][/T:bf]\n\n\ - /C Befehl FÃ¼hrt den Befehl in der Zeichenfolge aus. AnschlieÃend\n\ - wird diese Instanz beendet.\n\ - /K Befehl FÃ¼hrt den Befehl in der Zeichenfolge aus und lÃ¤uft weiter.\n\ - /P CMD wird permanent und fÃ¼hrt autoexec.bat aus\n\ - (kann nicht beendet werden).\n\ - /T:bf Ãndert die Hintergrund- und Vordergrund-Farbe (siehe COLOR Befehl)." + /C Befehl FÃ¼hrt den Befehl in der Zeichenfolge aus. AnschlieÃend\n\ + wird diese Instanz beendet.\n\ + /K Befehl FÃ¼hrt den Befehl in der Zeichenfolge aus und lÃ¤uft weiter.\n\ + /P CMD wird permanent und fÃ¼hrt autoexec.bat aus\n\ + (kann nicht beendet werden).\n\ + /T:bf Ãndert die Hintergrund- und Vordergrund-Farbe (siehe COLOR Befehl)." STRING_COLOR_HELP1, "Legt die Standardhinter- und Vordergrundfarben fÃ¼r die Konsole fest.\n\n\ COLOR [attr [/F]] \n\n\ @@ -107,15 +107,15 @@ auf den Vordergrund. \n\ Es mÃ¼ssen jeweils zwei Werte angegeben werden. \n\ Farben:\n\ -Dez Hex Name dec hex name\n\ -0 0 Schwarz 8 8 Dunkelgrau\n\ +Dez Hex Name dec hex name\n\ +0 0 Schwarz 8 8 Dunkelgrau\n\ 1 1 Dunkelblau 9 9 Blau\n\ -2 2 DunkelgrÃ¼n 10 A GrÃ¼n\n\ -3 3 BlaugrÃ¼n 11 B Zyan\n\ -4 4 Dunkelrot 12 C Rot\n\ -5 5 Lila 13 D Magenta\n\ -6 6 Ocker 14 E Gelb\n\ -7 7 Hellgrau 15 F WeiÃ\n\ +2 2 DunkelgrÃ¼n 10 A GrÃ¼n\n\ +3 3 BlaugrÃ¼n 11 B Zyan\n\ +4 4 Dunkelrot 12 C Rot\n\ +5 5 Lila 13 D Magenta\n\ +6 6 Ocker 14 E Gelb\n\ +7 7 Hellgrau 15 F WeiÃ\n\ Beispiel: ""COLOR fc"" legt Rot als Text- und WeiÃ als Hintergrund-\n\ farbe fest" @@ -262,6 +262,11 @@ STRING_FREE_HELP2, "Zeigt die Volumeinformationen an.\n\nFREE [Laufwerk: ...]" +STRING_GOTO_HELP1, "Setzt die AusfÃ¼hrung eines Batchprogramms an einer Marke fort.\n\n\ +GOTO Marke\n\n\ + Marke Definiert eine Zeichenfolge als Marke in einem Batchprogramm.\n\n\ +Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt." + STRING_IF_HELP1, "Verarbeitet AusdrÃ¼cke in einer Batchdatei abhÃ¤ngig von Bedingungen.\n\n\ IF [NOT] ERRORLEVEL Nummer Befehl\n\ IF [NOT] variable1==variable2 Befehl\n\ @@ -278,11 +283,6 @@ EXIST Dateiname Bedingung ist erfÃ¼llt, wenn die angegebene Datei existiert.\n\ DEFINED variable Bedingung ist erfÃ¼llt, wenn die angegebene Datei definiert\n\ wurde." - -STRING_GOTO_HELP1, "Setzt die AusfÃ¼hrung eines Batchprogramms an einer Marke fort.\n\n\ -GOTO Marke\n\n\ - Marke Definiert eine Zeichenfolge als Marke in einem Batchprogramm.\n\n\ -Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt." STRING_LABEL_HELP1, "Erstellt, Ã¤ndert oder lÃ¶scht die Bezeichnung eines Volumes.\n\nLABEL [Laufwerk:][label]" @@ -554,6 +554,7 @@ title neuer Titel" STRING_HELP1, "Ãbersicht aller verfÃ¼gbaren Befehle und deren Kurzbeschreibungen\n\n\ + help Befehl\n\ Befehl /? Um nÃ¤here Informationen zu einem bestimmten Befehl\n\ zu erhalten.\n\n\ ? Listet alle Befehle auf (ohne ErklÃ¤rung).\n\ Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -266,6 +266,11 @@ STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]\n" +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ +GOTO label\n\n\ + label Specifies a text string used in a batch script as a label.\n\n\ +You type a label on a line by itself, beginning with a colon." + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -281,11 +286,6 @@ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - -STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ -GOTO label\n\n\ - label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]\n" @@ -381,9 +381,9 @@ 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 Doesnt prompt for user\n" -STRING_RMDIR_HELP2, "Directory is not empty!\n" +/S Deletes all files and folders within 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\ @@ -494,7 +494,7 @@ will toggle stopwatch state\n\n" STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename \n\ - /P Shows one screen of output at a time.\n" + /P Shows one screen of output at a time.\n" STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ Sets whether to verify that your files are written correctly to a\n\ @@ -559,6 +559,7 @@ STRING_HELP1, "List of all available commands (+ description)\n\n\ + help command\n\ command /? For more information on a specific command\n\n\ ? List all available commands without description).\n\ ALIAS Sets, removes or shows aliases.\n\ Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -266,6 +266,11 @@ STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]\n" +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ +GOTO label\n\n\ + label Specifies a text string used in a batch script as a label.\n\n\ +You type a label on a line by itself, beginning with a colon." + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -281,11 +286,6 @@ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - -STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ -GOTO label\n\n\ - label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]\n" @@ -381,9 +381,9 @@ 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 Doesnt prompt for user\n" -STRING_RMDIR_HELP2, "Directory is not empty!\n" +/S Deletes all files and folders within 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\ @@ -494,7 +494,7 @@ will toggle stopwatch state\n\n" STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename \n\ - /P Shows one screen of output at a time.\n" + /P Shows one screen of output at a time.\n" STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ Sets whether to verify that your files are written correctly to a\n\ @@ -559,6 +559,7 @@ STRING_HELP1, "List of all available commands (+ description)\n\n\ + help command\n\ command /? For more information on a specific command\n\n\ ? List all available commands (without description).\n\ ALIAS Sets, removes or shows aliases.\n\ Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -152,7 +152,7 @@ /N Nada.\n\ /P Prompt. Pregunta antes de borar cada archivo\n\ /T Total. Muestra el nÃºmero total de archivos eliminados y el espacio\n\ - liberado en disco\n\ + liberado en disco\n\ /Q Modo silencioso.\n\ /W Limpiar. Sobreescribe el archivo con nÃºmeros aleatorios despuÃ©s de eliminarlo.\n\ /Y Si. Borra incluso *.* sin preguntar.\n\ @@ -198,8 +198,8 @@ /S Muestra los archivos en el directorio especificado y sus subdirectorios.\n\ /T Controla que campo de tiempo se muestra o es usado para ordenar:\n\ campo de tiempo C CreaciÃ³n\n\ - A Ãltimo acceso\n\ - W Ãltima escritura\n\ + A Ãltimo acceso\n\ + W Ãltima escritura\n\ /W Usa el formato de lista a lo ancho.\n\ /X Muestra los nombres cortos generados para archivos que no tienen un\n\ nombre 8.3. El formato es como /N pero con el nombre corto colocado\n\ @@ -266,6 +266,11 @@ %16s bytes libres\n" STRING_FREE_HELP2, "Muestra la informaciÃ³n de la unidad.\n\nFREE [unidad: ...]\n" + +STRING_GOTO_HELP1, "Manda al CMD a una linea etiquetada en un archivo por lotes.\n\n\ +GOTO etiqueta\n\n\ + etiqueta Especifica la cadena de texto usada en el archivo por lotes como etiqueta.\n\n\ +Escriba la etiqueta en la linea misma, empezando con dos puntos." STRING_IF_HELP1, "Ejecuta procesos condicionales en archivos por lotes.\n\n\ IF [NOT] ERRORLEVEL nÃºmero comando\n\ @@ -280,11 +285,6 @@ string1==string2 Especifica una condiciÃ³n verdadera si las cadenas de texto coinciden.\n\ EXIST archivo Especifica una condiciÃ³n verdadera si existe el archivo especificado.\n\ DEFINED variable Especifica una condiciÃ³n verdadera si la variable estÃ¡ definida.\n" - -STRING_GOTO_HELP1, "Manda al CMD a una linea etiquetada en un archivo por lotes.\n\n\ -GOTO etiqueta\n\n\ - etiqueta Especifica la cadena de texto usada en el archivo por lotes como etiqueta.\n\n\ -Escriba la etiqueta en la linea misma, empezando con dos puntos." STRING_LABEL_HELP1, "Muestra o cambia la etiqueta de una unidad.\n\nLABEL [unidad:][etiqueta]\n" @@ -495,7 +495,7 @@ cambiara el estado de parada del reloj\n\n" STRING_TYPE_HELP1, "Muestra los contenidos de un archivo de texto.\n\nTYPE [unidad:][ruta]archivo \n\ - /P Muestra sÃ³lo una pantalla de salida cada vez.\n" + /P Muestra sÃ³lo una pantalla de salida cada vez.\n" STRING_VERIFY_HELP1, "Â¡Â¡Este comando es solo de relleno!!\n\ Configura si hay que verificar que los archivos se and escrito correctamente\n\ @@ -560,6 +560,7 @@ STRING_HELP1, "Lista de todos los comandos disponibles (con descripciÃ³n)\n\n\ + help comando\n\ comando /? Para mÃ¡s informaciÃ³n del comando especificado.\n\n\ ? Muestra todos los comandos disponibles (sin la descripciÃ³n).\n\ ALIAS Crea, borra o muestra los alias.\n\ Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -281,6 +281,11 @@ STRING_FREE_HELP2, "Affiche les information d'un disque.\n\nFREE [lecteur: ...]" +STRING_GOTO_HELP1, "Dirige CMD vers une ligne nommÃ©e dans un script batch.\n\n\ +GOTO label\n\n\ + label SpÃ©cifie un champ texte utilisÃ© dans un script batch comme un label.\n\n\ +Vous Ã©crivez un label seul sur une ligne commenÃ§ant par un deux-points.\n" + STRING_IF_HELP1, "ExÃ©cute un traitement conditionnel dans des programmes batch.\n\n\ IF [NOT] ERRORLEVEL nombre commande\n\ IF [NOT] chaine1==chaine2 commande\n\ @@ -293,11 +298,6 @@ chaine1==chaine2 La condition sera vraie si les deux chaines sont identiques.\n\ EXIST nomfichier La condition sera vraie si le fichier spÃ©cifiÃ© existe.\n\ DEFINED variable La condition sera vraie si la variable indiquÃ©e est dÃ©finie." - -STRING_GOTO_HELP1, "Dirige CMD vers une ligne nommÃ©e dans un script batch.\n\n\ -GOTO label\n\n\ - label SpÃ©cifie un champ texte utilisÃ© dans un script batch comme un label.\n\n\ -Vous Ã©crivez un label seul sur une ligne commenÃ§ant par un deux-points.\n" STRING_LABEL_HELP1, "Affiche ou change le nom de volume du disque.\n\nLABEL [disque:][nomdevolume]\n" @@ -396,9 +396,9 @@ 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" -STRING_RMDIR_HELP2, "Le rÃ©pertoire n'est pas vide!\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\ @@ -508,7 +508,7 @@ changera l'Ã©tat du chronomÃ¨tre sÃ©lectionnÃ©\n\n" STRING_TYPE_HELP1, "Affiche le contenu de fichiers textes.\n\nTYPE [lecteur:][chemin]nomfich \n\ - /P Ne montre qu'un Ã©cran de contenu Ã la fois.\n" + /P Ne montre qu'un Ã©cran de contenu Ã la fois.\n" STRING_VERIFY_HELP1, "Cette commande ne fait rien !!\n\ SpÃ©cifie s'il faut verifier que vos fichiers sont Ã©crits correctement.\ @@ -573,6 +573,7 @@ STRING_HELP1, "Liste de toutes les commandes disponibles (+ description)\n\n\ + help commande\n\ commande /? Pour plus d'informations sur une commande spÃ©cifique\n\n\ ? Liste toutes les commandes disponibles sans leur description).\n\ ALIAS DÃ©fini, supprime ou montre les alias.\n\ Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -106,7 +106,7 @@ 3 SÃ¶tÃ©tlila B TÃ¼rkÃzkÃ©k\n\ 4 BordÃ³ C VÃ¶rÃ¶s\n\ 5 CiklÃ¡men D CiklÃ¡men\n\ -6 OlÃva E SÃ¡rga\n\ +6 OlÃva E SÃ¡rga\n\ 7 VilÃ¡gos szÃ¼rke F FehÃ©r\n" STRING_COPY_HELP1, "FelÃ¼lÃrja a kÃ¶vetkezÃµt: %s (Igen/Nem/Mind)? " @@ -251,6 +251,11 @@ STRING_FREE_HELP2, "KÃ¶tet mÃ©ret informÃ¡ciÃ³k.\n\nFREE [meghajtÃ³: ...]\n" +STRING_GOTO_HELP1, "ÃtirÃ¡nyÃt egy mÃ¡sik cÃmkÃ©re a batch Ã¡llomÃ¡nyban.\n\n\ +GOTO cÃmke\n\n\ + cÃmke A megadott cÃmkÃ©re fog ugrani az Ã©rtelmezÃµ.\n\n\ +Egy cÃmkÃ©t egy sorban lehet megadni, ':' -tal kezdve." + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -266,11 +271,6 @@ EXIST Ã¡llomÃ¡nyname Specifies a true condition if the specified Ã¡llomÃ¡nyname exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - -STRING_GOTO_HELP1, "ÃtirÃ¡nyÃt egy mÃ¡sik cÃmkÃ©re a batch Ã¡llomÃ¡nyban.\n\n\ -GOTO cÃmke\n\n\ - cÃmke A megadott cÃmkÃ©re fog ugrani az Ã©rtelmezÃµ.\n\n\ -Egy cÃmkÃ©t egy sorban lehet megadni, ':' -tal kezdve." STRING_LABEL_HELP1, "A kÃ¶tet cÃmkÃ©jÃ©t megjelenÃti, vagy megvÃ¡ltoztatja.\n\n\ LABEL [meghajtÃ³:] [Ãºj_cÃmke]\n" @@ -373,7 +373,7 @@ RENAME [/E /N /P /Q /S /T] rÃ©gi_nÃ©v ... Ãºj_nÃ©v\n\ REN [/E /N /P /Q /S /T] rÃ©gi_nÃ©v ... Ãºj_nÃ©v\n\n\ /E HibaÃ¼zenetek elrejtÃ©se.\n\ - /N Ne csinÃ¡ljon semmit .\n\ + /N Ne csinÃ¡ljon semmit.\n\ /P Minden Ã¡llomÃ¡nynÃ¡l rÃ¡kÃ©rdez. (MÃ©g NEM mÃ»kÃ¶dik!!)\n\ /Q Csendes mÃ»kÃ¶dÃ©s.\n\ /S AlmappÃ¡kat is Ã¡tnevez.\n\ @@ -479,7 +479,7 @@ STRING_TYPE_HELP1, "MegjelenÃti az Ã¡llomÃ¡nyok tartalmÃ¡t.\n\n\ TYPE [meghajtÃ³:][elÃ©rÃ©si_Ãºt]Ã¡llomÃ¡nynÃ©v \n\ - /P Csak egy kÃ©pernyÃµnyi tartalmat jelenÃt meg egyszerre.\n" + /P Csak egy kÃ©pernyÃµnyi tartalmat jelenÃt meg egyszerre.\n" STRING_VERIFY_HELP1, "Ez a parancs mÃ©g nem mÃ»kÃ¶dik!!\n\ Lemezre ÃrÃ¡s utÃ¡ni ellenÃµrzÃ©st Ã¡llÃtja be.\n\n\ @@ -543,6 +543,7 @@ STRING_HELP1, "TÃ¡mogatott parancsok megjelenÃtÃ©se\n\n\ + help parancs\n\ parancs /? TÃ¶bb (rÃ©szletes) informÃ¡ciÃ³ megtekintÃ©sÃ©hez hasznÃ¡ld ezt.\n\n\ ? Minden tÃ¡mogatott parancs megjelenÃtÃ©se (rÃ©szletek nÃ©lkÃ¼l).\n\ ALIAS MegjelenÃti, vagy megvÃ¡ltoztatja az aliasokat.\n\ Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -267,6 +267,11 @@ STRING_FREE_HELP2, "Menampilkan informasi drive.\n\nFREE [drive: ...]\n" +STRING_GOTO_HELP1, "Mengarahkan CMD ke baris berlabel dalam naskah batch.\n\n\ +GOTO label\n\n\ + label Menetapkan string teks yang digunakan dalam naskah batch sebagai label.\n\n\ +Anda mengetik label pada sebuah baris, dimulai dengan titik dua." + STRING_IF_HELP1, "Melakukan pemrosesan kondisional dalam program batch.\n\n\ IF [NOT] ERRORLEVEL nomor perintah\n\ IF [NOT] string1==string2 perintah\n\ @@ -281,11 +286,6 @@ sama.\n\ EXIST filename Menetapkan kondisi benar jika nama file ada.\n\ DEFINED variable Menetapkan kondisi benar jika variabel didefinisikan.\n" - -STRING_GOTO_HELP1, "Mengarahkan CMD ke baris berlabel dalam naskah batch.\n\n\ -GOTO label\n\n\ - label Menetapkan string teks yang digunakan dalam naskah batch sebagai label.\n\n\ -Anda mengetik label pada sebuah baris, dimulai dengan titik dua." STRING_LABEL_HELP1, "Menampilkan atau mengubah label drive.\n\nLABEL [drive:][label]\n" @@ -381,9 +381,9 @@ 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" -STRING_RMDIR_HELP2, "Direktori tidak kosong!\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\ @@ -495,7 +495,7 @@ akan menghidupkan/mematikan keadaan stopwatch\n\n" STRING_TYPE_HELP1, "Menampilkan isi dari file teks.\n\nTYPE [drive:][path]filename \n\ - /P Menampilkan satu layar output sekali waktu.\n" + /P Menampilkan satu layar output sekali waktu.\n" STRING_VERIFY_HELP1, "Perintah ini hanya dummy!!\n\ Menyetel apakah memverifikasi bawa file anda ditulis dengan benar ke\n\ @@ -558,6 +558,7 @@ STRING_HELP1, "Daftar semua perintah yang tersedia (+ deskripsi)\n\n\ + help command\n\ command /? Untuk informasi lengkap pada perintah tertentu\n\n\ ? Daftar semua perintah yang tersedia tanpa deskripsi.\n\ ALIAS Menyetel, menghapus atau menampilkan alias.\n\ Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -264,6 +264,12 @@ STRING_FREE_HELP2, "Visualizza le informazioni sul disco.\n\nFREE [disco: ...]\n" +STRING_GOTO_HELP1, "Porta l'esecuzione di un batch alla linea con l'etichetta\n\ + indicata.\n\n\ +GOTO etichetta\n\n\ + etichetta Indica il testo utilizzato come etichetta in un batch.\n\n\ +Nel batch questa deve trovarsi da sola in una linea con davanti due punti :.\n" + STRING_IF_HELP1, "Esegue una elaborazione condizionale nei batch.\n\n\ IF [NOT] ERRORLEVEL numero comando\n\ IF [NOT] stringa1==stringa2 comando\n\ @@ -278,12 +284,6 @@ string1==string2 E' verificata se sono uguali le due stringhe\n\ EXIST nomefile E' verificata se il file esiste.\n\ DEFINED variabile E' verificata se la variabile Ã¨ definita.\n" - -STRING_GOTO_HELP1, "Porta l'esecuzione di un batch alla linea con l'etichetta\n\ - indicata.\n\n\ -GOTO etichetta\n\n\ - etichetta Indica il testo utilizzato come etichetta in un batch.\n\n\ -Nel batch questa deve trovarsi da sola in una linea con davanti due punti :.\n" STRING_LABEL_HELP1, "Visualizza o modifica l'etichetta di un disco.\n\n\ LABEL [disco:][etichetta]\n" @@ -386,9 +386,9 @@ 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" -STRING_RMDIR_HELP2, "La cartella non Ã¨ vuota!\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\ @@ -500,7 +500,7 @@ STRING_TYPE_HELP1, "Visualizza il contenuto di un file di testo.\n\n\ TYPE [disco:][percorso]nomefile \n\ - /P Mostra una schermata alla volta.\n" + /P Mostra una schermata alla volta.\n" STRING_VERIFY_HELP1, "Questo comando non Ã¨ implementato!!\n\ Attiva o disattiva la verifica automatica della scrittura dei file\n\ @@ -566,6 +566,7 @@ STRING_HELP1, "Elenco di tutti i comandi disponibili (+ descrizione)\n\n\ + help comando\n\ comando /? Per i dettagli su uno specifico comando\n\n\ ? Elenco di tutti i comandi disponibili.\n\ ALIAS Imposta, toglie o visualizza gli alias.\n\ Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -271,6 +271,12 @@ STRING_FREE_HELP2, "ãã©ã¤ãã«é¢ããæå ±ãè¡¨ç¤ºãã¾ãã\n\nFREE [ãã©ã¤ã: ...]\n" +STRING_GOTO_HELP1, "ããã ããã°ã©ã åã®ãã©ãã«ã§æå®ããã¦ããè¡ã¸å¶å¾¡ãç§»åãã¾ãã\n\n\ +GOTO ã©ãã«\n\n\ + ã©ãã« ããã ããã°ã©ã ã§ã©ãã«ã¨ãã¦ä½¿ç¨ããããã¹ãæååãæå®ãã¾ãã\n\n\ +ã©ãã«ã®åé ã«ã¯ : (ã³ãã³) ãæå®ããã©ãã«ã ããåç¬ã§ 1 è¡ã«å¥åãã¦ãã \n\ +ããã" + STRING_IF_HELP1, "ããã ããã°ã©ã ä¸ã§æ¡ä»¶å¦çãå®è¡ãã¾ãã\n\n\ IF [NOT] ERRORLEVEL çªå· ã³ãã³ã\n\ IF [NOT] æåå1==æåå2 ã³ãã³ã\n\ @@ -287,12 +293,6 @@ æå®ãã¾ãã\n\ DEFINED å¤æ° æå®ããå¤æ°ãå®ç¾©ããã¦ããã¨ãã«æ¡ä»¶ãçã«ãªãããã«\n\ æå®ãã¾ãã\n" - -STRING_GOTO_HELP1, "ããã ããã°ã©ã åã®ãã©ãã«ã§æå®ããã¦ããè¡ã¸å¶å¾¡ãç§»åãã¾ãã\n\n\ -GOTO ã©ãã«\n\n\ - ã©ãã« ããã ããã°ã©ã ã§ã©ãã«ã¨ãã¦ä½¿ç¨ããããã¹ãæååãæå®ãã¾ãã\n\n\ -ã©ãã«ã®åé ã«ã¯ : (ã³ãã³) ãæå®ããã©ãã«ã ããåç¬ã§ 1 è¡ã«å¥åãã¦ãã \n\ -ããã" STRING_LABEL_HELP1, "ãã£ã¹ã¯ã®ããªã¥ã¼ã ã©ãã«ãè¡¨ç¤ºã¾ãã¯å¤æ´ãã¾ãã\n\nLABEL [ãã©ã¤ã:][ã©ãã«]\n" @@ -392,7 +392,7 @@ RMDIR [ãã©ã¤ã:]ãã¹\nRD [ãã©ã¤ã:]ãã¹\n\ /S æå®ããããã£ã¬ã¯ããªåã«ãããã¡ã¤ã«ããã©ã«ãããã¹ã¦åé¤ãã¾ãã\n\ /Q ç¢ºèªã®ã¡ãã»ã¼ã¸ãè¡¨ç¤ºãã¾ããã\n" -STRING_RMDIR_HELP2, "ãã£ã¬ã¯ããªãç©ºã§ã¯ããã¾ãã!\n" +STRING_RMDIR_HELP2, "ãã£ã¬ã¯ããªãç©ºã§ã¯ããã¾ãã!\n" STRING_REN_HELP1, "ãã¡ã¤ã«ããã£ã¬ã¯ããª (è¤æ°å¯) ã®ååãå¤æ´ãã¾ãã\n\n\ RENAME [/E /N /P /Q /S /T] åã®ãã¡ã¤ã«å ... æ°ãã¡ã¤ã«å\n\ @@ -503,7 +503,7 @@ ç¶æãåãæ¿ãã¾ãã\n\n" STRING_TYPE_HELP1, "ããã¹ã ãã¡ã¤ã«ã¾ãã¯ãã¡ã¤ã«ã®åå®¹ãè¡¨ç¤ºãã¾ãã\n\nTYPE [ãã©ã¤ã:][ãã¹]ãã¡ã¤ã«å \n\ - /P 1 åº¦ã« 1 ç»é¢ãã¤è¡¨ç¤ºãã¾ãã\n" + /P 1 åº¦ã« 1 ç»é¢ãã¤è¡¨ç¤ºãã¾ãã\n" STRING_VERIFY_HELP1, "ãã®ã³ãã³ãã¯ããã¼ã§ã!!\n\ ãã¡ã¤ã«ããã£ã¹ã¯ã«æ£ããæ¸ãè¾¼ã¾ãããã¨ãç§åãããã©ãããæç¤ºãã¾ãã\n\n\ @@ -566,6 +566,7 @@ STRING_HELP1, "å©ç¨å¯è½ãªãã¹ã¦ã®ã³ãã³ãã®ä¸è¦§ã¨ããã®èª¬æã\n\n\ + help ã³ãã³ã\n\ ã³ãã³ã /? ç¹å®ã®ã³ãã³ãã«é¢ããè©³ç´°æå ±\n\n\ ? å©ç¨å¯è½ãªãã¹ã¦ã®ã³ãã³ãã®ä¸è¦§ (èª¬æãªã)ã\n\ ALIAS ã¨ã¤ãªã¢ã¹ã®è¨å®ãè§£é¤ãããããã¨ã¤ãªã¢ã¹ãè¡¨ç¤ºããããã¾ãã\n\ Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -118,7 +118,7 @@ kilde Spesifiserer filen eller filer som kopieres.\n\ /A Indikerer en ASCII tekst fil.\n\ /B Indikerer en binÃ¦r fil.\n\ - mÃ¥l Spesifiserer mappen og/eller filnavn for den nye fil(ene).\n\ + mÃ¥l Spesifiserer mappen og/eller filnavn for den nye fil(ene).\n\ /V Bekreftet at nye filer er skrevet korrekt.\n\ /Y Undertrykker spÃ¸rsmÃ¥l om Ã¥ godkjenne hvorvidt du Ã¸nsker Ã¥ overskrive en\n\ eksisterende destinasjonsfil.\n\ @@ -262,6 +262,11 @@ STRING_FREE_HELP2, "Vis stasjonsinformasjon.\n\nFREE [stasjon: ...]\n" +STRING_GOTO_HELP1, "Leder CMD til en merket linje i et satsvis skript.\n\n\ +GOTO merke\n\n\ + merke angir en tekst streng brukt i en satsvis skript.\n\n\ +Et merke opprettes pÃ¥ egen linje ved Ã¥ skrive kolon fulgt av navn pÃ¥ merke." + STRING_IF_HELP1, "UtfÃ¸re betinget behandling i satsvise programmer.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ IF [NOT] streng1==streng2 kommando\n\ @@ -277,11 +282,6 @@ DEFINED variabel Angir et oppfylt vilkÃ¥r hvis spesifisert variabel er\n\ definert.\n" -STRING_GOTO_HELP1, "Leder CMD til en merket linje i et satsvis skript.\n\n\ -GOTO merke\n\n\ - merke angir en tekst streng brukt i en satsvis skript.\n\n\ -Et merke opprettes pÃ¥ egen linje ved Ã¥ skrive kolon fulgt av navn pÃ¥ merke." - STRING_LABEL_HELP1, "Viser eller endrer navn pÃ¥ stasjon.\n\nLABEL [stasjon:][merke]\n" STRING_LABEL_HELP2, "Volumet i stasjon %c: er %s\n" @@ -333,7 +333,7 @@ YESNO, YESNOCANCEL\n\ tittel tittel pÃ¥ meldingsboks\n\ melding tekst som vises i meldingsboks\n\n\n\ -ERRORLEVEL settes avhengig av hvilken knapp som trykkes:\n\n\ +ERRORLEVEL settes avhengig av hvilken knapp som trykkes:\n\n\ JA : 10 | NEI : 11\n\ OK : 10 | AVBRYT : 12\n" @@ -376,9 +376,9 @@ 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" -STRING_RMDIR_HELP2, "Mappen er ikke tom!\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\ @@ -489,7 +489,7 @@ vil status for stoppeklokken veksles.\n\n" STRING_TYPE_HELP1, "Vis innholdet av tekstfiler.\n\nSkriv [stasjon:][mappe]filnavn \n\ - /P Vis en full skjerm om gangen.\n" + /P Vis en full skjerm om gangen.\n" STRING_VERIFY_HELP1, "Denne kommandoen er bare en etterlikning!!\n\ Angir om det skal bekreftes at dine filer er skrevet korrekt til disk \n\n\ @@ -553,6 +553,7 @@ STRING_HELP1, "Liste av alle tilgjengelige kommandoer (+ beskrivelse)\n\n\ +help kommando\n\ kommando /? For mer informasjon om en bestemt kommando\n\n\ ? Lister alle tilgjengelige kommando uten beskrivelse).\n\ ALIAS Sett, fjern eller vis alias.\n\ Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -270,6 +270,11 @@ STRING_FREE_HELP2, "WyÅwietla informacje o wolnym miejscu w napÄdzie.\n\nFREE [napÄd: ...]\n" +STRING_GOTO_HELP1, "Przekierowuje CMD do oznaczonej linii w programie wsadowym.\n\n\ +GOTO etykieta\n\n\ + etykieta CiÄg znakÃ³w, uÅ¼yty w programie wsadowym do oznaczenia linii.\n\n\ +MoÅ¼esz oznaczyÄ linie dowolnÄ etykietÄ, zaczynajÄc od dwukropka." + STRING_IF_HELP1, "Wykonuje przetwarzanie warunkowe w programach wsadowych.\n\n\ IF [NOT] ERRORLEVEL numer komenda\n\ IF [NOT] ciÄg_znakÃ³w1==ciÄg_znakÃ³w2 komenda\n\ @@ -283,11 +288,6 @@ ciÄg1==ciÄg2 Zwraca PRAWDA, gdy oba ciÄgi znakÃ³w sÄ identyczne\n\ EXIST plik Zwraca PRAWDA, jeÅli podany plik istnieje.\n\ DEFINED zmienna Zwraca PRAWDA, jeÅli podana zmienna zostaÅa zdefiniowana\n" - -STRING_GOTO_HELP1, "Przekierowuje CMD do oznaczonej linii w programie wsadowym.\n\n\ -GOTO etykieta\n\n\ - etykieta CiÄg znakÃ³w, uÅ¼yty w programie wsadowym do oznaczenia linii.\n\n\ -MoÅ¼esz oznaczyÄ linie dowolnÄ etykietÄ, zaczynajÄc od dwukropka." STRING_LABEL_HELP1, "WyÅwietla lub zmienia etykietÄ napÄdu.\n\nLABEL [napÄd:][etykieta]\n" @@ -383,9 +383,9 @@ 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" -STRING_RMDIR_HELP2, "Katalog nie jest pusty!\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\ @@ -496,7 +496,7 @@ komenda zmieni obecny stan stopera\n\n" STRING_TYPE_HELP1, "WyÅwietla zawartoÅÄ plikÃ³w tekstowych.\n\nTYPE [napÄd:][ÅcieÅ¼ka]nazwa_pliku \n\ - /P Pauzuje po kaÅ¼dym peÅnym ekranie.\n" + /P Pauzuje po kaÅ¼dym peÅnym ekranie.\n" STRING_VERIFY_HELP1, "Ta komenda jest tylko na podpuchÄ\ Odpowiada za to, czy po zapisaniu plikÃ³w ma nastÄpiÄ sprawdzenie\n\ @@ -560,6 +560,7 @@ STRING_HELP1, "Lista wszystkich dostÄpnych komend (+opisy)\n\n\ + help komenda\n\ komenda /? WyÅwietla dokÅadny opis danej komendy\n\n\ ? Lista wszystkich dostÄpnych komend (bez opisÃ³w).\n\ ALIAS Ustawia, pokazuje lub usuwa aliasy.\n\ Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -294,6 +294,12 @@ STRING_FREE_HELP2, "AfiÈeazÄ informaÈia unei unitÄÈi (de stocare).\n\nFREE [unitate: ...]\n" +STRING_GOTO_HELP1, "ExecutÄ un salt cÄtre o linie etichetatÄ Ã®n interiorul unui fiÈier de comenzi.\n\n\ +GOTO etichetÄ\n\n\ + etichetÄ SpecificÄ un Èir text utilizat ca etichetÄ Ã®n\n\ + fiÈierele de comenzi.\n\n\ +O etichetÄ se va defini pe un rÃ¢nd Ã®ntreg, Ã®ncepÃ¢nd cu douÄ puncte (:)\n" + STRING_IF_HELP1, "RealizeazÄ execuÈia condiÈionatÄ a comenzilor Ã®ntr-un fiÈier de comenzi.\n\n\ IF [NOT] ERRORLEVEL numÄr comandÄ\n\ IF [NOT] Èir1==Èir2 comandÄ\n\ @@ -312,12 +318,6 @@ fiÈierului specificat.\n\ DEFINED variablÄ DeterminÄ o condiÈie satisfÄcutÄ dacÄ Â«variabilÄÂ»\n\ a fost anterior definitÄ.\n" - -STRING_GOTO_HELP1, "ExecutÄ un salt cÄtre o linie etichetatÄ Ã®n interiorul unui fiÈier de comenzi.\n\n\ -GOTO etichetÄ\n\n\ - etichetÄ SpecificÄ un Èir text utilizat ca etichetÄ Ã®n\n\ - fiÈierele de comenzi.\n\n\ -O etichetÄ se va defini pe un rÃ¢nd Ã®ntreg, Ã®ncepÃ¢nd cu douÄ puncte (:)\n" STRING_LABEL_HELP1, "AfiÈeazÄ sau modificÄ eticheta unei unitÄÈi (de stocare).\n\nLABEL [unitate:][etichetÄ]\n" @@ -420,7 +420,7 @@ RMDIR [unitate:]cale\nRD [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" +STRING_RMDIR_HELP2, "Directorul nu este gol!\n" STRING_REN_HELP1, "RedenumeÈte un fiÈier/director sau fiÈiere/directoare.\n\n\ RENAME [/E /N /P /Q /S /T] nume_vechi ... nume_nou\n\ @@ -594,6 +594,7 @@ STRING_HELP1, "EnumerÄ toate comenzile disponibile (+ descriere)\n\n\ + help comandÄ\n\ comandÄ /? Pentru mai multe informaÈii referitoare la o anume comandÄ.\n\n\ ? EnumerÄ toate comenzile disponibile (fÄrÄ descriere).\n\ ALIAS Instituie, destituie sau afiÈeazÄ alias.\n\ Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -267,6 +267,11 @@ STRING_FREE_HELP2, "ÐÑÐ²Ð¾Ð´Ð¸Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ¾Ð¼Ðµ.\n\nFREE [drive: ...]\n" +STRING_GOTO_HELP1, "ÐÐµÑÐµÐ´Ð°ÑÐ° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐµÐ¹ Ð¼ÐµÑÐºÑ ÑÑÑÐ¾ÐºÐµ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°.\n\n\ +GOTO Ð¼ÐµÑÐºÐ°\n\n\ + label Ð¡ÑÑÐ¾ÐºÐ° Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°, Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ðº Ð¼ÐµÑÐºÐ°.\n\n\ +ÐÐµÑÐºÐ° Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑÑ Ð² Ð¾ÑÐ´ÐµÐ»ÑÐ½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐµ Ð¸ Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ Ð´Ð²Ð¾ÐµÑÐ¾ÑÐ¸Ñ." + STRING_IF_HELP1, "ÐÐ¿ÐµÑÐ°ÑÐ¾Ñ ÑÑÐ»Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð² Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð¼ ÑÐ°Ð¹Ð»Ðµ.\n\n\ IF [NOT] ERRORLEVEL ÑÐ¸ÑÐ»Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ IF [NOT] ÑÑÑÐ¾ÐºÐ°1==ÑÑÑÐ¾ÐºÐ°2 ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ @@ -286,11 +291,6 @@ ÐÐ° ÑÑÐ¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð¼Ð¾Ð¶ÐµÑ ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÑ ÐºÐ»ÑÑÐµÐ²Ð¾Ðµ ÑÐ»Ð¾Ð²Ð¾ ELSE,\n\ ÑÐ»ÑÐ¶Ð°ÑÐµÐµ Ð´Ð»Ñ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ, ÐºÐ¾ÑÐ¾ÑÐ°Ñ Ð´Ð¾Ð»Ð¶Ð½Ð°\n\ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÑÑÑÑ Ð² ÑÐ¾Ð¼ ÑÐ»ÑÑÐ°Ðµ, ÐµÑÐ»Ð¸ ÑÑÐ»Ð¾Ð²Ð¸Ðµ Ð»Ð¾Ð¶Ð½Ð¾.\n" - -STRING_GOTO_HELP1, "ÐÐµÑÐµÐ´Ð°ÑÐ° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÐµÐ¹ Ð¼ÐµÑÐºÑ ÑÑÑÐ¾ÐºÐµ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°.\n\n\ -GOTO Ð¼ÐµÑÐºÐ°\n\n\ - label Ð¡ÑÑÐ¾ÐºÐ° Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°, Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð½Ð°Ñ ÐºÐ°Ðº Ð¼ÐµÑÐºÐ°.\n\n\ -ÐÐµÑÐºÐ° Ð´Ð¾Ð»Ð¶Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑÑ Ð² Ð¾ÑÐ´ÐµÐ»ÑÐ½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐµ Ð¸ Ð½Ð°ÑÐ¸Ð½Ð°ÑÑÑÑ Ñ Ð´Ð²Ð¾ÐµÑÐ¾ÑÐ¸Ñ." STRING_LABEL_HELP1, "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¼ÐµÑÐ¾Ðº ÑÐ¾Ð¼Ð°.\n\nLABEL [Ð´Ð¸ÑÐº:][Ð¼ÐµÑÐºÐ°]\n" @@ -386,9 +386,9 @@ STRING_RMDIR_HELP, "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°.\n\n\ RMDIR [Ð´Ð¸ÑÐº:]Ð¿ÑÑÑ\nRD [Ð´Ð¸ÑÐº:]Ð¿ÑÑÑ\n\ -/S Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð´ÐµÑÐµÐ²Ð° ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²\n\ -/Q ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð·Ð°Ð¿ÑÐ¾ÑÐ° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ\n" -STRING_RMDIR_HELP2, "ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿ÑÑÑ!\n" +/S Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð´ÐµÑÐµÐ²Ð° ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²\n\ +/Q ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð·Ð°Ð¿ÑÐ¾ÑÐ° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ\n" +STRING_RMDIR_HELP2, "ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð¿ÑÑÑ!\n" STRING_REN_HELP1, "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸Ð»Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð².\n\n\ RENAME [/E /N /P /Q /S /T] ÑÑÐ°ÑÐ¾Ðµ_Ð¸Ð¼Ñ ... Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ\n\ @@ -500,7 +500,7 @@ Ð¿ÐµÑÐµÐºÐ»ÑÑÐ°ÐµÑ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ðµ ÑÐµÐºÑÐ½Ð´Ð¾Ð¼ÐµÑÐ°\n\n" STRING_TYPE_HELP1, "ÐÑÐ²Ð¾Ð´ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ñ ÑÐµÐºÑÑÐ¾Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð².\n\nTYPE [Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ]Ð¸Ð¼Ñ ÑÐ°Ð¹Ð»Ð° \n\ - /P ÐÐ¾ÑÐºÑÐ°Ð½Ð½ÑÐ¹ Ð²ÑÐ²Ð¾Ð´.\n" + /P ÐÐ¾ÑÐºÑÐ°Ð½Ð½ÑÐ¹ Ð²ÑÐ²Ð¾Ð´.\n" STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ ÐÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ¶Ð¸Ð¼Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð² a\n\ @@ -565,6 +565,7 @@ STRING_HELP1, "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð²ÑÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ñ ÐºÐ¾ÑÐ¾ÑÐºÐ¸Ð¼ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼\n\n\ + help ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° /? ÐÑÐ²Ð¾Ð´Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ\n\n\ ? Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð²ÑÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð±ÐµÐ· Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ.\n\ ALIAS ÐÑÐ²Ð¾Ð´, ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¸Ð»Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð¾Ð².\n\ Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -270,6 +270,11 @@ STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]\n" +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ +GOTO label\n\n\ + label Specifies a text string used in a batch script as a label.\n\n\ +You type a label on a line by itself, beginning with a colon." + STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ IF [NOT] ERRORLEVEL number command\n\ IF [NOT] string1==string2 command\n\ @@ -285,11 +290,6 @@ EXIST filename Specifies a true condition if the specified filename exists.\n\ DEFINED variable Specifies a true condition if the specified variable is\n\ defined.\n" - -STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ -GOTO label\n\n\ - label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]\n" @@ -385,9 +385,9 @@ 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 Doesnt prompt for user\n" -STRING_RMDIR_HELP2, "Directory is not empty!\n" +/S Deletes all files and folders within 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\ @@ -498,7 +498,7 @@ will toggle stopwatch state\n\n" STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename \n\ - /P Shows one screen of output at a time.\n" + /P Shows one screen of output at a time.\n" STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ Sets whether to verify that your files are written correctly to a\n\ @@ -563,6 +563,7 @@ STRING_HELP1, "Zoznam vÅ¡etkÃ½ch dostupnÃ½ch prÃkazov (+ popis)\n\n\ + help prÃkaz\n\ prÃkaz /? Pre viac informÃ¡ciÃ o konkrÃ©tnom prÃkaze\n\n\ ? Zoznam vÅ¡etkÃ½ch dostupnÃ½ch prÃkazov (bez popisu).\n\ ALIAS Sets, removes or shows aliases.\n\ Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -26,8 +26,8 @@ STRING_ALIAS_HELP, "SÃ¤tter, tar bort eller visar alias.\n\n\ ALIAS [alias=[Kommando]]\n\n\ - alias Namn pÃ¥ ett alias.\n\ - Kommando Text som skall erstÃ¤ttas av ett alias.\n\n\ + alias Namn pÃ¥ ett alias.\n\ + Kommando Text som skall erstÃ¤ttas av ett alias.\n\n\ fÃ¶r att lista alla alias:\n\ ALIAS\n\n\ FÃ¶r att sÃ¤tta ett nytt eller Ã¤ndra ett befintligt alias:\n\ @@ -118,7 +118,7 @@ kÃ¤lla Anger filen eller filerna som kopieras.\n\ /A Anger att filen Ã¤r en ASCII-textfil.\n\ /B Anger att filen Ã¤r en binÃ¤r-fil.\n\ - mÃ¥l Anger mappen och/eller filnamn fÃ¶r den nya filen/filerna.\n\ + mÃ¥l Anger mappen och/eller filnamn fÃ¶r den nya filen/filerna.\n\ /V Kontrollera att nya filer Ã¤r korrekt skrivna.\n\ /Y Undertrycker frÃ¥gor om att godkÃ¤nna om du Ã¶nskar att skriva Ã¶ver\n\ befintlig destinationsfil.\n\ @@ -262,6 +262,11 @@ STRING_FREE_HELP2, "Visa enhetsinformation.\n\nFREE [enhet: ...]\n" +STRING_GOTO_HELP1, "Dirigerar CMD till en namngiven etikett i ett batchprogram.\n\n\ +GOTO etikett\n\n\ + etikett Anger en text strÃ¤ng anvÃ¤nt i ett batchprogram.\n\n\ +En etikett skapas pÃ¥ en egen rad genom att skriva kolon fÃ¶ljt av namn pÃ¥ etiketten." + STRING_IF_HELP1, "UtfÃ¶r villkorsstyrd bearbetning i batchprogram.\n\n\ IF [NOT] ERRORLEVEL nummer kommando\n\ IF [NOT] strÃ¤ng1==strÃ¤ng2 kommando\n\ @@ -277,11 +282,6 @@ DEFINED variabel Anger ett uppfyllt villkor om angiven variabel Ã¤r\n\ definerad.\n" -STRING_GOTO_HELP1, "Dirigerar CMD till en namngiven etikett i ett batchprogram.\n\n\ -GOTO etikett\n\n\ - etikett Anger en text strÃ¤ng anvÃ¤nt i ett batchprogram.\n\n\ -En etikett skapas pÃ¥ en egen rad genom att skriva kolon fÃ¶ljt av namn pÃ¥ etiketten." - STRING_LABEL_HELP1, "Skapar, tar bort eller Ã¤ndrar etikett pÃ¥ enhet.\n\nLABEL [enhet:][etikett]\n" STRING_LABEL_HELP2, "Volymen i enhet %c: Ã¤r %s\n" @@ -333,9 +333,9 @@ YESNO, YESNOCANCEL\n\ tittel tittel pÃ¥ meldingsboks\n\ melding text som vises i meldingsboks\n\n\n\ -ERRORLEVEL settes avhengig av hvilken knapp som trykkes:\n\n\ -JA : 10 | NEI : 11\n\ -OK : 10 | AVBRYT : 12\n" +ERRORLEVEL settes avhengig av hvilken knapp som trykkes:\n\n\ +JA : 10 | NEI : 11\n\ +OK : 10 | AVBRYT : 12\n" STRING_PATH_HELP1, "Viser eller setter en sÃ¸kesti for kjÃ¸rbare filer.\n\n\ PATH [[enhet:]mapp[;...]]\nPATH ;\n\n\ @@ -376,9 +376,9 @@ 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" -STRING_RMDIR_HELP2, "mappn Ã¤r inte tom!\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\ @@ -489,7 +489,7 @@ vil status for stoppeklokken veksles.\n\n" STRING_TYPE_HELP1, "Vis innholdet av tekstfiler.\n\nSkriv [enhet:][mapp]filnamn \n\ - /P Vis en full skjerm om gangen.\n" + /P Vis en full skjerm om gangen.\n" STRING_VERIFY_HELP1, "Denne kommandoen Ã¤r bare en etterlikning!!\n\ Anger om det skal bekreftes at dine filer Ã¤r skrevet korrekt til disk \n\n\ @@ -553,6 +553,7 @@ STRING_HELP1, "Liste av alle tilgjengelige kommandoer (+ beskrivelse)\n\n\ +help kommando\n\ kommando /? For mer informasjon om en bestemt kommando\n\n\ ? Lister alle tilgjengelige kommando uten beskrivelse).\n\ ALIAS Sett, fjern eller vis alias.\n\ Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -273,6 +273,11 @@ STRING_FREE_HELP2, "ÐÐ¸Ð²Ð¾Ð´Ð¸ÑÑ iÐ½ÑÐ¾ÑÐ¼Ð°ÑiÑ Ð¿ÑÐ¾ ÑÐ¾Ð¼.\n\nFREE [drive: ...]\n" +STRING_GOTO_HELP1, "ÐÐµÑÐµÐ´Ð°ÑÐ° ÑÐ¿ÑÐ°Ð²Ð»ÑÐ½Ð½Ñ ÑÑÐ´ÐºÑ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ, ÑÐ¾ Ð¼iÑÑÐ¸ÑÑ Ð¼iÑÐºÑ.\n\n\ +GOTO Ð¼iÑÐºÐ°\n\n\ + label ÑÑÐ´Ð¾Ðº Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ, Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐº Ð¼iÑÐºÐ°.\n\n\ +ÐÑÑÐºÐ° Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¸ÑÐ¸ÑÑ Ð² Ð¾ÐºÑÐµÐ¼Ð¾Ð¼Ñ ÑÑÐ´ÐºÑ i Ð¿Ð¾ÑÐ¸Ð½Ð°ÑÐ¸ÑÑ Ð· Ð´Ð²Ð¾ÐºÑÐ°Ð¿ÐºÐ¸." + STRING_IF_HELP1, "ÐÐ¿ÐµÑÐ°ÑÐ¾Ñ ÑÐ¼Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ñ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð¼Ñ ÑÐ°Ð¹Ð»i.\n\n\ IF [NOT] ERRORLEVEL ÑÐ¸ÑÐ»Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ IF [NOT] ÑÑÐ´Ð¾Ðº1==ÑÑÐ´Ð¾Ðº2 ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ @@ -288,11 +293,6 @@ EXIST iÐ¼'Ñ_ÑÐ°Ð¹Ð»Ñ Ð£Ð¼Ð¾Ð²Ð° Ñ iÑÑÐ¸Ð½Ð½Ð¾Ñ, ÑÐºÑÐ¾ ÑÐ°Ð¹Ð» Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¼ iÐ¼ÐµÐ½ÐµÐ¼ iÑÐ½ÑÑ.\n\ DEFINED Ð·Ð¼iÐ½Ð½Ð° Ð¦Ñ ÑÐ¼Ð¾Ð²Ð° Ñ iÑÑÐ¸Ð½Ð½Ð¾Ñ, ÑÐºÑÐ¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð° Ð·Ð¼iÐ½Ð½Ð°\n\ Ð·Ð°Ð´Ð°Ð½Ð°.\n" - -STRING_GOTO_HELP1, "ÐÐµÑÐµÐ´Ð°ÑÐ° ÑÐ¿ÑÐ°Ð²Ð»ÑÐ½Ð½Ñ ÑÑÐ´ÐºÑ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ, ÑÐ¾ Ð¼iÑÑÐ¸ÑÑ Ð¼iÑÐºÑ.\n\n\ -GOTO Ð¼iÑÐºÐ°\n\n\ - label ÑÑÐ´Ð¾Ðº Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ, Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐº Ð¼iÑÐºÐ°.\n\n\ -ÐÑÑÐºÐ° Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° Ð·Ð½Ð°ÑÐ¾Ð´Ð¸ÑÐ¸ÑÑ Ð² Ð¾ÐºÑÐµÐ¼Ð¾Ð¼Ñ ÑÑÐ´ÐºÑ i Ð¿Ð¾ÑÐ¸Ð½Ð°ÑÐ¸ÑÑ Ð· Ð´Ð²Ð¾ÐºÑÐ°Ð¿ÐºÐ¸." STRING_LABEL_HELP1, "ÐiÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ Ð·Ð¼iÐ½Ð° Ð¼iÑÐºÐ¸ ÑÐ¾Ð¼Ñ.\n\nLABEL [Ð´Ð¸ÑÐº:][Ð¼iÑÐºÐ°]\n" @@ -388,9 +388,9 @@ STRING_RMDIR_HELP, "ÐÐ¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ.\n\n\ RMDIR [Ð´Ð¸ÑÐº:]ÑÐ»ÑÑ\nRD [Ð´Ð¸ÑÐº:]ÑÐ»ÑÑ\n\ -/S ÐÐ¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²ÑÑÐ¾Ð³Ð¾ Ð´ÐµÑÐµÐ²Ð° Ð²ÑÐµÑÐµÐ´Ð¸Ð½i ÑiÐ»i\n\ -/Q ÐÐ¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿iÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ\n" -STRING_RMDIR_HELP2, "ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð½Ðµ Ð¿Ð¾ÑÐ¾Ð¶Ð½iÐ¹!\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\ @@ -500,7 +500,7 @@ ÑÑÐ°Ð½ ÑÐµÐºÑÐ½Ð´Ð¾Ð¼iÑÐ°\n\n" STRING_TYPE_HELP1, "ÐÐ¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð²Ð¼iÑÑÑ ÑÐµÐºÑÑÐ¾Ð²Ð¸Ñ ÑÐ°Ð¹Ð»iÐ².\n\nTYPE [Ð´Ð¸ÑÐº:][ÑÐ»ÑÑ]iÐ¼'Ñ_ÑÐ°Ð¹Ð»Ñ \n\ - /P ÐÐ¾ÐµÐºÑÐ°Ð½Ð½Ð¸Ð¹ Ð²Ð¸Ð²iÐ´.\n" + /P ÐÐ¾ÐµÐºÑÐ°Ð½Ð½Ð¸Ð¹ Ð²Ð¸Ð²iÐ´.\n" STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ ÐÐ²iÐ¼ÐºÐ½ÐµÐ½Ð½Ñ ÑÐ¸ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ Ð¿ÐµÑÐµÐ²iÑÐºÐ¸ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾ÑÑi Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ°Ð¹Ð»iÐ²\n\ @@ -565,6 +565,7 @@ STRING_HELP1, "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð²ÑiÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ (+ Ð¾Ð¿Ð¸Ñ)\n\n\ + help ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°\n\ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° /? ÐÐ»Ñ Ð´Ð¾ÐºÐ»Ð°Ð´Ð½Ð¾Ñ iÐ½ÑÐ¾ÑÐ¼Ð°ÑiÑ Ð¿ÑÐ¾ ÐºÐ¾Ð½ÐºÑÐµÑÐ½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ\n\n\ ? Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð²ÑiÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð±ÐµÐ· Ð¾Ð¿Ð¸ÑÑ.\n\ ALIAS ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ Ð¿Ð¾ÐºÐ°Ð· Ð¿ÑÐµÐ²Ð´Ð¾Ð½iÐ¼iÐ².\n\ @@ -663,8 +664,8 @@ STRING_GOTO_ERROR1, "ÐÐµ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð° Ð¼iÑÐºÐ° Ð´Ð»Ñ GOTO" STRING_GOTO_ERROR2, "ÐiÑÐºÐ° '%s' Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð°\n" -STRING_MD_ERROR, "ÐiÐ´ÐºÐ°ÑÐ°Ð»Ð¾Ð³ ÑÐ¸ ÑÐ°Ð¹Ð» Ð²Ð¶Ðµ iÑÐ½ÑÑ.\n" -STRING_MD_ERROR2, "Ð¨Ð»ÑÑ Ð´Ð¾ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Ð½Ðµ iÑÐ½ÑÑ.\n" +STRING_MD_ERROR, "ÐiÐ´ÐºÐ°ÑÐ°Ð»Ð¾Ð³ ÑÐ¸ ÑÐ°Ð¹Ð» Ð²Ð¶Ðµ iÑÐ½ÑÑ.\n" +STRING_MD_ERROR2, "Ð¨Ð»ÑÑ Ð´Ð¾ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Ð½Ðµ iÑÐ½ÑÑ.\n" STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°]\n" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sun Jun 30 13:49:54 2013 @@ -254,6 +254,11 @@ STRING_FREE_HELP2, "æ¾ç¤ºé©±å¨å¨ä¿¡æ¯ã\n\nFREE [é©±å¨å¨: ...]\n" +STRING_GOTO_HELP1, "å¨æ¹å¤çèæ¬ä¸å° CMD å®åå°è¢«æ è®°çè¡æ§è¡ã\n\n\ +GOTO æ ç¾\n\n\ + æ ç¾ å¨æ¹å¤çèæ¬ä¸è¢«ç¨ä½æ ç¾çææ¬åç¬¦ä¸²ã\n\n\ +ä½¿ç¨åå·å¼å¤´çä¸è¡å°±ä½ä¸ºä¸ä¸ªæ ç¾ã" + STRING_IF_HELP1, "å¨æ¹å¤çæä»¶ä¸æ§è¡æ¡ä»¶æ§å¶å¤çã\n\n\ IF [NOT] ERRORLEVEL æ°å å½ä»¤\n\ IF [NOT] åç¬¦ä¸²1==åç¬¦ä¸²2 å½ä»¤\n\ @@ -265,11 +270,6 @@ åç¬¦ä¸²1==åç¬¦ä¸²2 å½ææå®çåç¬¦ä¸²ç¸å¹éæ¶ä¸ºçã\n\ EXIST æä»¶å å½æå®çæä»¶ååå¨æ¶ä¸ºçã\n\ DEFINED åé å½æå®çåéå·²è¢«å®ä¹æ¶ä¸ºçã\n" - -STRING_GOTO_HELP1, "å¨æ¹å¤çèæ¬ä¸å° CMD å®åå°è¢«æ è®°çè¡æ§è¡ã\n\n\ -GOTO æ ç¾\n\n\ - æ ç¾ å¨æ¹å¤çèæ¬ä¸è¢«ç¨ä½æ ç¾çææ¬åç¬¦ä¸²ã\n\n\ -ä½¿ç¨åå·å¼å¤´çä¸è¡å°±ä½ä¸ºä¸ä¸ªæ ç¾ã" STRING_LABEL_HELP1, "æ¾ç¤ºææ¹åé©±å¨å¨å·æ ã\n\nLABEL [é©±å¨å¨:][å·æ ]\n" @@ -363,9 +363,9 @@ STRING_RMDIR_HELP, "å é¤ä¸ä¸ªç®å½ã\n\n\ RMDIR [é©±å¨å¨:]è·¯å¾\nRD [é©±å¨å¨:]è·¯å¾\n\ -/S å é¤ç®æ ä¸çæææä»¶åæä»¶å¤¹ã\n\ -/Q å é¤æ¶ä¸è¦æç¤ºã\n" -STRING_RMDIR_HELP2, "ç®å½éç©ºï¼\n" +/S å é¤ç®æ ä¸çæææä»¶åæä»¶å¤¹ã\n\ +/Q å é¤æ¶ä¸è¦æç¤ºã\n" +STRING_RMDIR_HELP2, "ç®å½éç©ºï¼\n" STRING_REN_HELP1, "éå½åä¸ä¸ªæèå¤ä¸ªæä»¶ææä»¶å¤¹ã\n\n\ RENAME [/E /N /P /Q /S /T] æ§åç§° ... æ°åç§°\n\ @@ -463,7 +463,7 @@ å¦ææ²¡æ ONï¼OFF æè /S å¨è°ç¨è¯¥å½ä»¤æ¶è¢«æå®ï¼å°ä¼åæ¢åè¡¨ç¶æã\n\n" STRING_TYPE_HELP1, "æ¾ç¤ºææ¬æä»¶çåå®¹ã\n\nTYPE [é©±å¨å¨:][è·¯å¾]æä»¶å \n\ - /P æ¯æ¬¡åªæ¾ç¤ºä¸å±åå®¹ã\n" + /P æ¯æ¬¡åªæ¾ç¤ºä¸å±åå®¹ã\n" STRING_VERIFY_HELP1, "è¿æ¡å½ä»¤åªæ¯ä¸ªæè®¾ï¼ï¼\n\ è®¾ç½®æ¯å¦æ£æ¥æ¨çæä»¶å·²è¢«æ£ç¡®å°åå¥ç£çã\n\n\ @@ -527,6 +527,7 @@ STRING_HELP1, "ååºææå¯ç¨å½ä»¤ (+ å®ä»¬çæè¿°)\n\n\ + help å½ä»¤\n\ å½ä»¤ /? å¾å°ç¹å®å½ä»¤çæ´å¤ä¿¡æ¯\n\n\ ? ååºææå¯ç¨å½ä»¤ (æ²¡ææè¿°)ã\n\ ALIAS è®¾ç½®ãå é¤ææ¾ç¤ºå«åã\n\

11 years, 5 months

[hbelusca] 59390: [CMD] Fix some people's names presentation

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 30 13:23:30 2013 New Revision: 59390 URL: http://svn.reactos.org/svn/reactos?rev=59390&view=rev Log: [CMD] Fix some people's names presentation Modified: trunk/reactos/base/shell/cmd/alias.c trunk/reactos/base/shell/cmd/attrib.c trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/beep.c trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/chcp.c trunk/reactos/base/shell/cmd/cls.c trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/echo.c trunk/reactos/base/shell/cmd/error.c trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/free.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/label.c trunk/reactos/base/shell/cmd/memory.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/msgbox.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/shell/cmd/path.c trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/screen.c trunk/reactos/base/shell/cmd/set.c trunk/reactos/base/shell/cmd/setlocal.c trunk/reactos/base/shell/cmd/shift.c trunk/reactos/base/shell/cmd/start.c trunk/reactos/base/shell/cmd/time.c trunk/reactos/base/shell/cmd/title.c trunk/reactos/base/shell/cmd/type.c trunk/reactos/base/shell/cmd/verify.c trunk/reactos/base/shell/cmd/window.c Modified: trunk/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/alias.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -25,10 +25,10 @@ * 24-Jan-1998 Eric Kohl * Redirection safe! * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc * - * 02-Feb-2008 (Christoph von Wittich) <christoph_vw(a)reactos.org>) + * 02-Feb-2008 (Christoph von Wittich <christoph_vw(a)reactos.org>) * rewrote alias handling for doskey compat */ Modified: trunk/reactos/base/shell/cmd/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/attrib.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/attrib.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/attrib.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -28,7 +28,7 @@ * 23-Jan-1999 Eric Kohl * Added handling of multiple filenames. * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -212,15 +212,15 @@ bc->mem = (char *)cmd_alloc(bc->memsize+1); /* 1 extra for '\0' */ /* if memory is available, read it in and close the file */ - if (bc->mem != NULL) + if (bc->mem != NULL) { TRACE ("BatchFile2Mem memory %08x - %08x\n",bc->mem,bc->memsize); SetFilePointer (hBatchFile, 0, NULL, FILE_BEGIN); ReadFile(hBatchFile, (LPVOID)bc->mem, bc->memsize, &bc->memsize, NULL); bc->mem[bc->memsize]='\0'; /* end this, so you can dump it as a string */ bc->memfree=TRUE; /* this one needs to be freed */ - } - else + } + else { bc->memsize=0; /* this will prevent mem being accessed */ bc->memfree=FALSE; @@ -244,11 +244,11 @@ HANDLE hFile = 0; SetLastError(0); - if (bc && bc->mem) + if (bc && bc->mem) { TCHAR fpname[MAX_PATH]; GetFullPathName(fullname, sizeof(fpname) / sizeof(TCHAR), fpname, NULL); - if (_tcsicmp(bc->BatchFilePath,fpname)==0) + if (_tcsicmp(bc->BatchFilePath,fpname)==0) same_fn=TRUE; } TRACE ("Batch: (\'%s\', \'%s\', \'%s\') same_fn = %d\n", @@ -312,7 +312,7 @@ GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); /* if a new batch file, load it into memory and close the file */ - if (!same_fn) + if (!same_fn) { BatchFile2Mem(hFile); CloseHandle(hFile); @@ -402,12 +402,12 @@ lpString = lpBuffer; #endif /* read all chars from memory until a '\n' is encountered */ - if (bc->mem) - { - for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) - { + if (bc->mem) + { + for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) + { lpString[len] = bc->mem[bc->mempos++]; - if (lpString[len] == '\n' ) + if (lpString[len] == '\n' ) { len++; break; Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -17,7 +17,7 @@ INT shiftlevel[10]; BOOL bEcho; /* Preserve echo flag across batch calls */ REDIRECTION *RedirList; - PARSED_COMMAND *current; + PARSED_COMMAND *current; struct _SETLOCAL *setlocal; } BATCH_CONTEXT, *LPBATCH_CONTEXT; Modified: trunk/reactos/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/beep.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/beep.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/beep.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -20,7 +20,7 @@ * 20-Jan-1999 (Eric Kohl) * Redirection ready! * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -24,7 +24,7 @@ * 20-Jan-1999 (Eric Kohl) * Unicode and redirection safe! * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -7,7 +7,7 @@ * 23-Dec-1998 (Eric Kohl) * Started. * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cls.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cls.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cls.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -22,7 +22,7 @@ * 20-Jan-1998 (Eric Kohl) * Redirection ready! * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/color.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/color.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -16,7 +16,7 @@ * 14-Oct-1999 (Paolo Pantaleo <paolopan(a)freemail.it>) * 4nt's syntax implemented. * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 03-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Move all hardcoded strings in En.rc. */ Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -7,13 +7,13 @@ * 20-Jan-1999 (Eric Kohl) * started * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 03-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc * - * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu> + * 01-Jul-2005 (Brandon Turner <turnerb7(a)msu.edu>) * Added ConPrintfPaging and ConOutPrintfPaging * - * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com> + * 02-Feb-2007 (Paolo Devoti <devotip at gmail.com>) * Fixed ConPrintfPaging */ Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -20,13 +20,13 @@ * 27-Oct-1998 (Eric Kohl) * Disabled prompting when used in batch mode. * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) + * 03-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcode string to En.rc * - * 13-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) + * 13-Jul-2005 (Brandon Turner <turnerb7(a)msu.edu>) * Rewrite to clean up copy and support wildcard. * - * 20-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) + * 20-Jul-2005 (Brandon Turner <turnerb7(a)msu.edu>) * Add touch syntax. "copy arp.exe+,," * Copy command is now completed. */ Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -27,7 +27,7 @@ * 04-Feb-1999 (Eric Kohl) * Fixed date input bug. * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 03-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -22,7 +22,7 @@ * 13-Jul-2000 (Eric Kohl) * Implemented 'echo.' and 'echoerr.'. * - * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -16,7 +16,7 @@ * 02-Feb-1999 (Eric Kohl) * Use FormatMessage() for error reports. * - * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -26,7 +26,7 @@ * Implemented preservation of echo flag. Some other for related * code in other files fixed, too. * - * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/free.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/free.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/free.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -7,7 +7,7 @@ * 01-Sep-1999 (Eric Kohl) * Started. * - * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -22,7 +22,7 @@ * 27-Jan-1999 (Eric Kohl) * Added help text ("/?"). * - * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/label.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/label.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/label.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -13,7 +13,7 @@ * 19-Jan-1998 (Eric Kohl) * Unicode ready! * - * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/memory.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -7,7 +7,7 @@ * 01-Sep-1999 (Eric Kohl) * Started. * - * 28-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 28-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -28,7 +28,7 @@ * 06-Nov-1999 (Eric Kohl) * Added PagePrompt() and FilePrompt(). * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -21,10 +21,10 @@ * 03-Feb-1999 (Eric Kohl) * Added "/N" option. * -* 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) -* Remove all hardcode string to En.rc -* -* 24-Jun-2005 (Brandon Turner) <turnerb7(a)msu.edu>) +* 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) +* Remove all hardcoded strings in En.rc +* +* 24-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) * Fixed bug to allow MS style wildcards + code clean up * added /y and /-y */ Modified: trunk/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/msgbox.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/msgbox.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/msgbox.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -6,7 +6,7 @@ * 25 Aug 1999 * started - Paolo Pantaleo <paolopan(a)freemail.it> * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -123,7 +123,7 @@ break; } } - + /* Check for numbered redirection */ if ((Char >= _T('0') && Char <= _T('9') && (ParsePos == &ParseLine[1] || IsSeparator(ParsePos[-2])) Modified: trunk/reactos/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/path.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/path.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/path.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -22,7 +22,7 @@ * 24-Jan-1999 (Eric Kohl) * Fixed Win32 environment handling. * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ #include "precomp.h" Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -43,7 +43,7 @@ * 24-Jan-1999 (Eric Kohl) * Fixed Win32 environment handling. * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ #include "precomp.h" Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -17,10 +17,11 @@ * 17-Oct-2001 (Eric Kohl) * Implemented basic rename code. * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc * - * 25-Nov-2008 (Victor Martinez) <vicmarcal(a)hotmail.com> Patch dedicated to Myrjala because her comprenhension and love :D + * 25-Nov-2008 (Victor Martinez <vicmarcal(a)hotmail.com>) + * Patch dedicated to Myrjala because her comprenhension and love :D * Fixing following Bugs: * -Wrong behavior with wildcards when Source and Destiny are Paths(FIXED). * -Wrong general behavior (MSDN:"Rename cant move files between subdirectories")(FIXED) Modified: trunk/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/screen.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -6,7 +6,7 @@ * 30 Aug 1999 * started - Paolo Pantaleo <paolopan(a)freemail.it> * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc * */ Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -30,7 +30,7 @@ * 25-Feb-1999 (Eric Kohl) * Fixed little bug. * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/setlocal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -5,7 +5,7 @@ * * 1 Feb 2008 (Christoph von Wittich) * started. -*/ +*/ #include "precomp.h" Modified: trunk/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/shift.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/shift.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -19,7 +19,7 @@ * 20-Jan-1999 (Eric Kohl) * Unicode and redirection safe! * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -7,7 +7,7 @@ * 24-Jul-1999 (Eric Kohl) * Started. * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/time.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/time.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/time.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -20,7 +20,7 @@ * 04-Feb-1999 (Eric Kohl) * Fixed time input bug. * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc. */ Modified: trunk/reactos/base/shell/cmd/title.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/title.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/title.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/title.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -5,7 +5,7 @@ * History: * 1999-02-11 Emanuele Aliberti * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -22,7 +22,7 @@ * 19-Jan-1999 (Paolo Pantaleo <paolopan(a)freemail.it>) * Added multiple file support (copied from y.c) * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/verify.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/verify.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/verify.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -14,7 +14,7 @@ * 20-Jan-1999 (Eric Kohl) * Unicode and redirection ready! * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */ Modified: trunk/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/window.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/window.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/window.c [iso-8859-1] Sun Jun 30 13:23:30 2013 @@ -10,7 +10,7 @@ * activate and window in a single file using mainly the same code * (nice size optimization :) * - * 30-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * 30-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) * Remove all hardcoded strings in En.rc */

11 years, 5 months

[hbelusca] 59389: [CMD] And finally... ... ... fix whitespace, part 6/6 !!!! (convert tabs into 4-space indent). Really, CMD is, together with win32k, the worst indented project I've ever seen. You...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 30 13:11:20 2013 New Revision: 59389 URL: http://svn.reactos.org/svn/reactos?rev=59389&view=rev Log: [CMD] And finally... ... ... fix whitespace, part 6/6 !!!! (convert tabs into 4-space indent). Really, CMD is, together with win32k, the worst indented project I've ever seen. You have lots of non-sensical extra newlines put in the middle of the code, weird indentation made by a mix of tabs / spaces which take either 4 or 8 or even (!!) 2 spaces per indentation level; sometimes some guy mixed his space key with his tab key to add a space between a word and another one; a mix of some sh*tty code styles (K&R and personal ones), many many times no space between a logical keyword and the operand on which it applies, etc... etc... I tried to put some sense in it, but I may have forgotten some insidious tabs somewhere... Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Jun 30 13:11:20 2013 @@ -184,34 +184,34 @@ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeperator) { - TCHAR temp[39]; /* maximum length with nNumberGroups == 1 */ - UINT n, iTarget; - - if (len <= 1) - return 0; - - n = 0; - iTarget = nNumberGroups; - if (!nNumberGroups) - bPutSeperator = FALSE; - - do - { - if (iTarget == n && bPutSeperator) - { - iTarget += nNumberGroups + 1; - temp[38 - n++] = cThousandSeparator; - } - temp[38 - n++] = (TCHAR)(num % 10) + _T('0'); - num /= 10; - } while (num > 0); - if (n > len-1) - n = len-1; - - memcpy(des, temp + 39 - n, n * sizeof(TCHAR)); - des[n] = _T('\0'); - - return n; + TCHAR temp[39]; /* maximum length with nNumberGroups == 1 */ + UINT n, iTarget; + + if (len <= 1) + return 0; + + n = 0; + iTarget = nNumberGroups; + if (!nNumberGroups) + bPutSeperator = FALSE; + + do + { + if (iTarget == n && bPutSeperator) + { + iTarget += nNumberGroups + 1; + temp[38 - n++] = cThousandSeparator; + } + temp[38 - n++] = (TCHAR)(num % 10) + _T('0'); + num /= 10; + } while (num > 0); + if (n > len-1) + n = len-1; + + memcpy(des, temp + 39 - n, n * sizeof(TCHAR)); + des[n] = _T('\0'); + + return n; } /* @@ -219,42 +219,42 @@ */ static BOOL IsConsoleProcess(HANDLE Process) { - NTSTATUS Status; - PROCESS_BASIC_INFORMATION Info; - PEB ProcessPeb; - ULONG BytesRead; - - if (NULL == NtQueryInformationProcessPtr || NULL == NtReadVirtualMemoryPtr) - { - return TRUE; - } - - Status = NtQueryInformationProcessPtr ( - Process, ProcessBasicInformation, - &Info, sizeof(PROCESS_BASIC_INFORMATION), NULL); - if (! NT_SUCCESS(Status)) - { - WARN ("NtQueryInformationProcess failed with status %08x\n", Status); - return TRUE; - } - Status = NtReadVirtualMemoryPtr ( - Process, Info.PebBaseAddress, &ProcessPeb, - sizeof(PEB), &BytesRead); - if (! NT_SUCCESS(Status) || sizeof(PEB) != BytesRead) - { - WARN ("Couldn't read virt mem status %08x bytes read %lu\n", Status, BytesRead); - return TRUE; - } - - return IMAGE_SUBSYSTEM_WINDOWS_CUI == ProcessPeb.ImageSubsystem; + NTSTATUS Status; + PROCESS_BASIC_INFORMATION Info; + PEB ProcessPeb; + ULONG BytesRead; + + if (NULL == NtQueryInformationProcessPtr || NULL == NtReadVirtualMemoryPtr) + { + return TRUE; + } + + Status = NtQueryInformationProcessPtr ( + Process, ProcessBasicInformation, + &Info, sizeof(PROCESS_BASIC_INFORMATION), NULL); + if (! NT_SUCCESS(Status)) + { + WARN ("NtQueryInformationProcess failed with status %08x\n", Status); + return TRUE; + } + Status = NtReadVirtualMemoryPtr ( + Process, Info.PebBaseAddress, &ProcessPeb, + sizeof(PEB), &BytesRead); + if (! NT_SUCCESS(Status) || sizeof(PEB) != BytesRead) + { + WARN ("Couldn't read virt mem status %08x bytes read %lu\n", Status, BytesRead); + return TRUE; + } + + return IMAGE_SUBSYSTEM_WINDOWS_CUI == ProcessPeb.ImageSubsystem; } #ifdef _UNICODE -#define SHELLEXECUTETEXT "ShellExecuteExW" +#define SHELLEXECUTETEXT "ShellExecuteExW" #else -#define SHELLEXECUTETEXT "ShellExecuteExA" +#define SHELLEXECUTETEXT "ShellExecuteExA" #endif typedef BOOL (WINAPI *MYEX)(LPSHELLEXECUTEINFO lpExecInfo); @@ -262,42 +262,42 @@ HANDLE RunFile(DWORD flags, LPTSTR filename, LPTSTR params, LPTSTR directory, INT show) { - SHELLEXECUTEINFO sei; - HMODULE hShell32; - MYEX hShExt; - BOOL ret; - - TRACE ("RunFile(%s)\n", debugstr_aw(filename)); - hShell32 = LoadLibrary(_T("SHELL32.DLL")); - if (!hShell32) - { - WARN ("RunFile: couldn't load SHELL32.DLL!\n"); - return NULL; - } - - hShExt = (MYEX)(FARPROC)GetProcAddress(hShell32, SHELLEXECUTETEXT); - if (!hShExt) - { - WARN ("RunFile: couldn't find ShellExecuteExA/W in SHELL32.DLL!\n"); - FreeLibrary(hShell32); - return NULL; - } - - TRACE ("RunFile: ShellExecuteExA/W is at %x\n", hShExt); - - memset(&sei, 0, sizeof sei); - sei.cbSize = sizeof sei; - sei.fMask = flags; - sei.lpFile = filename; - sei.lpParameters = params; - sei.lpDirectory = directory; - sei.nShow = show; - ret = hShExt(&sei); - - TRACE ("RunFile: ShellExecuteExA/W returned 0x%p\n", ret); - - FreeLibrary(hShell32); - return ret ? sei.hProcess : NULL; + SHELLEXECUTEINFO sei; + HMODULE hShell32; + MYEX hShExt; + BOOL ret; + + TRACE ("RunFile(%s)\n", debugstr_aw(filename)); + hShell32 = LoadLibrary(_T("SHELL32.DLL")); + if (!hShell32) + { + WARN ("RunFile: couldn't load SHELL32.DLL!\n"); + return NULL; + } + + hShExt = (MYEX)(FARPROC)GetProcAddress(hShell32, SHELLEXECUTETEXT); + if (!hShExt) + { + WARN ("RunFile: couldn't find ShellExecuteExA/W in SHELL32.DLL!\n"); + FreeLibrary(hShell32); + return NULL; + } + + TRACE ("RunFile: ShellExecuteExA/W is at %x\n", hShExt); + + memset(&sei, 0, sizeof sei); + sei.cbSize = sizeof sei; + sei.fMask = flags; + sei.lpFile = filename; + sei.lpParameters = params; + sei.lpDirectory = directory; + sei.nShow = show; + ret = hShExt(&sei); + + TRACE ("RunFile: ShellExecuteExA/W returned 0x%p\n", ret); + + FreeLibrary(hShell32); + return ret ? sei.hProcess : NULL; } @@ -309,175 +309,174 @@ * First - first word on command line * Rest - rest of command line */ - static INT Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) { - TCHAR szFullName[MAX_PATH]; - TCHAR *first, *rest, *dot; - TCHAR szWindowTitle[MAX_PATH]; - DWORD dwExitCode = 0; - TCHAR *FirstEnd; - TCHAR szFullCmdLine [CMDLINE_LENGTH]; - - TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(First), debugstr_aw(Rest)); - - /* Though it was already parsed once, we have a different set of rules - for parsing before we pass to CreateProccess */ - if (First[0] == _T('/') || (First[0] && First[1] == _T(':'))) - { - /* Use the entire first word as the program name (no change) */ - FirstEnd = First + _tcslen(First); - } - else - { - /* If present in the first word, spaces and ,;=/ end the program - * name and become the beginning of its parameters. */ - BOOL bInside = FALSE; - for (FirstEnd = First; *FirstEnd; FirstEnd++) - { - if (!bInside && (_istspace(*FirstEnd) || _tcschr(_T(",;=/"), *FirstEnd))) - break; - bInside ^= *FirstEnd == _T('"'); - } - } - - /* Copy the new first/rest into the buffer */ - first = Full; - rest = &Full[FirstEnd - First + 1]; - _tcscpy(rest, FirstEnd); - _tcscat(rest, Rest); - *FirstEnd = _T('\0'); - _tcscpy(first, First); - - /* check for a drive change */ - if ((_istalpha (first[0])) && (!_tcscmp (first + 1, _T(":")))) - { - BOOL working = TRUE; - if (!SetCurrentDirectory(first)) - /* Guess they changed disc or something, handle that gracefully and get to root */ - { - TCHAR str[4]; - str[0]=first[0]; - str[1]=_T(':'); - str[2]=_T('\\'); - str[3]=0; - working = SetCurrentDirectory(str); - } - - if (!working) ConErrResPuts (STRING_FREE_ERROR1); - return !working; - } - - /* get the PATH environment variable and parse it */ - /* search the PATH environment variable for the binary */ - StripQuotes(First); - if (!SearchForExecutable(First, szFullName)) - { - error_bad_command(first); - return 1; - } - - GetConsoleTitle (szWindowTitle, MAX_PATH); - - /* check if this is a .BAT or .CMD file */ - dot = _tcsrchr (szFullName, _T('.')); - if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) - { - while (*rest == _T(' ')) - rest++; - TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); - dwExitCode = Batch(szFullName, first, rest, Cmd); - } - else - { - /* exec the program */ - PROCESS_INFORMATION prci; - STARTUPINFO stui; - - /* build command line for CreateProcess(): FullName + " " + rest */ + TCHAR szFullName[MAX_PATH]; + TCHAR *first, *rest, *dot; + TCHAR szWindowTitle[MAX_PATH]; + DWORD dwExitCode = 0; + TCHAR *FirstEnd; + TCHAR szFullCmdLine [CMDLINE_LENGTH]; + + TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(First), debugstr_aw(Rest)); + + /* Though it was already parsed once, we have a different set of rules + for parsing before we pass to CreateProccess */ + if (First[0] == _T('/') || (First[0] && First[1] == _T(':'))) + { + /* Use the entire first word as the program name (no change) */ + FirstEnd = First + _tcslen(First); + } + else + { + /* If present in the first word, spaces and ,;=/ end the program + * name and become the beginning of its parameters. */ + BOOL bInside = FALSE; + for (FirstEnd = First; *FirstEnd; FirstEnd++) + { + if (!bInside && (_istspace(*FirstEnd) || _tcschr(_T(",;=/"), *FirstEnd))) + break; + bInside ^= *FirstEnd == _T('"'); + } + } + + /* Copy the new first/rest into the buffer */ + first = Full; + rest = &Full[FirstEnd - First + 1]; + _tcscpy(rest, FirstEnd); + _tcscat(rest, Rest); + *FirstEnd = _T('\0'); + _tcscpy(first, First); + + /* check for a drive change */ + if ((_istalpha (first[0])) && (!_tcscmp (first + 1, _T(":")))) + { + BOOL working = TRUE; + if (!SetCurrentDirectory(first)) + /* Guess they changed disc or something, handle that gracefully and get to root */ + { + TCHAR str[4]; + str[0]=first[0]; + str[1]=_T(':'); + str[2]=_T('\\'); + str[3]=0; + working = SetCurrentDirectory(str); + } + + if (!working) ConErrResPuts (STRING_FREE_ERROR1); + return !working; + } + + /* get the PATH environment variable and parse it */ + /* search the PATH environment variable for the binary */ + StripQuotes(First); + if (!SearchForExecutable(First, szFullName)) + { + error_bad_command(first); + return 1; + } + + GetConsoleTitle (szWindowTitle, MAX_PATH); + + /* check if this is a .BAT or .CMD file */ + dot = _tcsrchr (szFullName, _T('.')); + if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) + { + while (*rest == _T(' ')) + rest++; + TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); + dwExitCode = Batch(szFullName, first, rest, Cmd); + } + else + { + /* exec the program */ + PROCESS_INFORMATION prci; + STARTUPINFO stui; + + /* build command line for CreateProcess(): FullName + " " + rest */ BOOL quoted = !!_tcschr(First, ' '); - _tcscpy(szFullCmdLine, quoted ? _T("\"") : _T("")); - _tcsncat(szFullCmdLine, First, CMDLINE_LENGTH - _tcslen(szFullCmdLine)); - _tcsncat(szFullCmdLine, quoted ? _T("\"") : _T(""), CMDLINE_LENGTH - _tcslen(szFullCmdLine)); - - if (*rest) - { - _tcsncat(szFullCmdLine, _T(" "), CMDLINE_LENGTH - _tcslen(szFullCmdLine)); - _tcsncat(szFullCmdLine, rest, CMDLINE_LENGTH - _tcslen(szFullCmdLine)); - } - - TRACE ("[EXEC: %s]\n", debugstr_aw(szFullCmdLine)); - - /* fill startup info */ - memset (&stui, 0, sizeof (STARTUPINFO)); - stui.cb = sizeof (STARTUPINFO); - stui.dwFlags = STARTF_USESHOWWINDOW; - stui.wShowWindow = SW_SHOWDEFAULT; - - // return console to standard mode - SetConsoleMode (GetStdHandle(STD_INPUT_HANDLE), - ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); - - if (CreateProcess (szFullName, - szFullCmdLine, - NULL, - NULL, - TRUE, - 0, /* CREATE_NEW_PROCESS_GROUP */ - NULL, - NULL, - &stui, - &prci)) - - { - CloseHandle(prci.hThread); - } - else - { - // See if we can run this with ShellExecute() ie myfile.xls - prci.hProcess = RunFile(SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE, - szFullName, - rest, - NULL, - SW_SHOWNORMAL); - } - - if (prci.hProcess != NULL) - { - if (IsConsoleProcess(prci.hProcess)) - { - EnterCriticalSection(&ChildProcessRunningLock); - dwChildProcessId = prci.dwProcessId; - - WaitForSingleObject (prci.hProcess, INFINITE); - - LeaveCriticalSection(&ChildProcessRunningLock); - - GetExitCodeProcess (prci.hProcess, &dwExitCode); - nErrorLevel = (INT)dwExitCode; - } - CloseHandle (prci.hProcess); - } - else - { - TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full)); - error_bad_command (first); - dwExitCode = 1; - } - - // restore console mode - SetConsoleMode ( - GetStdHandle( STD_INPUT_HANDLE ), - ENABLE_PROCESSED_INPUT ); - } - - /* Get code page if it has been change */ - InputCodePage= GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - SetConsoleTitle (szWindowTitle); - - return dwExitCode; + _tcscpy(szFullCmdLine, quoted ? _T("\"") : _T("")); + _tcsncat(szFullCmdLine, First, CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + _tcsncat(szFullCmdLine, quoted ? _T("\"") : _T(""), CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + + if (*rest) + { + _tcsncat(szFullCmdLine, _T(" "), CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + _tcsncat(szFullCmdLine, rest, CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + } + + TRACE ("[EXEC: %s]\n", debugstr_aw(szFullCmdLine)); + + /* fill startup info */ + memset (&stui, 0, sizeof (STARTUPINFO)); + stui.cb = sizeof (STARTUPINFO); + stui.dwFlags = STARTF_USESHOWWINDOW; + stui.wShowWindow = SW_SHOWDEFAULT; + + // return console to standard mode + SetConsoleMode (GetStdHandle(STD_INPUT_HANDLE), + ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); + + if (CreateProcess (szFullName, + szFullCmdLine, + NULL, + NULL, + TRUE, + 0, /* CREATE_NEW_PROCESS_GROUP */ + NULL, + NULL, + &stui, + &prci)) + + { + CloseHandle(prci.hThread); + } + else + { + // See if we can run this with ShellExecute() ie myfile.xls + prci.hProcess = RunFile(SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE, + szFullName, + rest, + NULL, + SW_SHOWNORMAL); + } + + if (prci.hProcess != NULL) + { + if (IsConsoleProcess(prci.hProcess)) + { + EnterCriticalSection(&ChildProcessRunningLock); + dwChildProcessId = prci.dwProcessId; + + WaitForSingleObject (prci.hProcess, INFINITE); + + LeaveCriticalSection(&ChildProcessRunningLock); + + GetExitCodeProcess (prci.hProcess, &dwExitCode); + nErrorLevel = (INT)dwExitCode; + } + CloseHandle (prci.hProcess); + } + else + { + TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full)); + error_bad_command (first); + dwExitCode = 1; + } + + // restore console mode + SetConsoleMode ( + GetStdHandle( STD_INPUT_HANDLE ), + ENABLE_PROCESSED_INPUT ); + } + + /* Get code page if it has been change */ + InputCodePage= GetConsoleCP(); + OutputCodePage = GetConsoleOutputCP(); + SetConsoleTitle (szWindowTitle); + + return dwExitCode; } @@ -489,70 +488,69 @@ * first - first word on command line * rest - rest of command line */ - INT DoCommand(LPTSTR first, LPTSTR rest, PARSED_COMMAND *Cmd) { - TCHAR *com; - TCHAR *cp; - LPTSTR param; /* pointer to command's parameters */ - INT cl; - LPCOMMAND cmdptr; - BOOL nointernal = FALSE; - INT ret; - - TRACE ("DoCommand: (\'%s\' \'%s\')\n", debugstr_aw(first), debugstr_aw(rest)); - - /* full command line */ - com = cmd_alloc((_tcslen(first) + _tcslen(rest) + 2) * sizeof(TCHAR)); - if (com == NULL) - { - error_out_of_memory(); - return 1; - } - - /* If present in the first word, these characters end the name of an - * internal command and become the beginning of its parameters. */ - cp = first + _tcscspn(first, _T("\t +,/;=[]")); - - for (cl = 0; cl < (cp - first); cl++) - { - /* These characters do it too, but if one of them is present, - * then we check to see if the word is a file name and skip - * checking for internal commands if so. - * This allows running programs with names like "echo.exe" */ - if (_tcschr(_T(".:\\"), first[cl])) - { - TCHAR tmp = *cp; - *cp = _T('\0'); - nointernal = IsExistingFile(first); - *cp = tmp; - break; - } - } - - /* Scan internal command table */ - for (cmdptr = cmds; !nointernal && cmdptr->name; cmdptr++) - { - if (!_tcsnicmp(first, cmdptr->name, cl) && cmdptr->name[cl] == _T('\0')) - { - _tcscpy(com, first); - _tcscat(com, rest); - param = &com[cl]; - - /* Skip over whitespace to rest of line, exclude 'echo' command */ - if (_tcsicmp(cmdptr->name, _T("echo")) != 0) - while (_istspace(*param)) - param++; - ret = cmdptr->func(param); - cmd_free(com); - return ret; - } - } - - ret = Execute(com, first, rest, Cmd); - cmd_free(com); - return ret; + TCHAR *com; + TCHAR *cp; + LPTSTR param; /* pointer to command's parameters */ + INT cl; + LPCOMMAND cmdptr; + BOOL nointernal = FALSE; + INT ret; + + TRACE ("DoCommand: (\'%s\' \'%s\')\n", debugstr_aw(first), debugstr_aw(rest)); + + /* full command line */ + com = cmd_alloc((_tcslen(first) + _tcslen(rest) + 2) * sizeof(TCHAR)); + if (com == NULL) + { + error_out_of_memory(); + return 1; + } + + /* If present in the first word, these characters end the name of an + * internal command and become the beginning of its parameters. */ + cp = first + _tcscspn(first, _T("\t +,/;=[]")); + + for (cl = 0; cl < (cp - first); cl++) + { + /* These characters do it too, but if one of them is present, + * then we check to see if the word is a file name and skip + * checking for internal commands if so. + * This allows running programs with names like "echo.exe" */ + if (_tcschr(_T(".:\\"), first[cl])) + { + TCHAR tmp = *cp; + *cp = _T('\0'); + nointernal = IsExistingFile(first); + *cp = tmp; + break; + } + } + + /* Scan internal command table */ + for (cmdptr = cmds; !nointernal && cmdptr->name; cmdptr++) + { + if (!_tcsnicmp(first, cmdptr->name, cl) && cmdptr->name[cl] == _T('\0')) + { + _tcscpy(com, first); + _tcscat(com, rest); + param = &com[cl]; + + /* Skip over whitespace to rest of line, exclude 'echo' command */ + if (_tcsicmp(cmdptr->name, _T("echo")) != 0) + while (_istspace(*param)) + param++; + ret = cmdptr->func(param); + cmd_free(com); + return ret; + } + } + + ret = Execute(com, first, rest, Cmd); + cmd_free(com); + return ret; } @@ -560,17 +558,16 @@ * process the command line and execute the appropriate functions * full input/output redirection and piping are supported */ - INT ParseCommandLine (LPTSTR cmd) { - INT Ret = 0; - PARSED_COMMAND *Cmd = ParseCommand(cmd); - if (Cmd) - { - Ret = ExecuteCommand(Cmd); - FreeCommand(Cmd); - } - return Ret; + INT Ret = 0; + PARSED_COMMAND *Cmd = ParseCommand(cmd); + if (Cmd) + { + Ret = ExecuteCommand(Cmd); + FreeCommand(Cmd); + } + return Ret; } /* Execute a command without waiting for it to finish. If it's an internal @@ -581,545 +578,545 @@ static HANDLE ExecuteAsync(PARSED_COMMAND *Cmd) { - TCHAR CmdPath[MAX_PATH]; - TCHAR CmdParams[CMDLINE_LENGTH], *ParamsEnd; - STARTUPINFO stui; - PROCESS_INFORMATION prci; - - /* Get the path to cmd.exe */ - GetModuleFileName(NULL, CmdPath, MAX_PATH); - - /* Build the parameter string to pass to cmd.exe */ - ParamsEnd = _stpcpy(CmdParams, _T("/S/D/C\"")); - ParamsEnd = Unparse(Cmd, ParamsEnd, &CmdParams[CMDLINE_LENGTH - 2]); - if (!ParamsEnd) - { - error_out_of_memory(); - return NULL; - } - _tcscpy(ParamsEnd, _T("\"")); - - memset(&stui, 0, sizeof stui); - stui.cb = sizeof(STARTUPINFO); - if (!CreateProcess(CmdPath, CmdParams, NULL, NULL, TRUE, 0, - NULL, NULL, &stui, &prci)) - { - ErrorMessage(GetLastError(), NULL); - return NULL; - } - - CloseHandle(prci.hThread); - return prci.hProcess; + TCHAR CmdPath[MAX_PATH]; + TCHAR CmdParams[CMDLINE_LENGTH], *ParamsEnd; + STARTUPINFO stui; + PROCESS_INFORMATION prci; + + /* Get the path to cmd.exe */ + GetModuleFileName(NULL, CmdPath, MAX_PATH); + + /* Build the parameter string to pass to cmd.exe */ + ParamsEnd = _stpcpy(CmdParams, _T("/S/D/C\"")); + ParamsEnd = Unparse(Cmd, ParamsEnd, &CmdParams[CMDLINE_LENGTH - 2]); + if (!ParamsEnd) + { + error_out_of_memory(); + return NULL; + } + _tcscpy(ParamsEnd, _T("\"")); + + memset(&stui, 0, sizeof stui); + stui.cb = sizeof(STARTUPINFO); + if (!CreateProcess(CmdPath, CmdParams, NULL, NULL, TRUE, 0, + NULL, NULL, &stui, &prci)) + { + ErrorMessage(GetLastError(), NULL); + return NULL; + } + + CloseHandle(prci.hThread); + return prci.hProcess; } static VOID ExecutePipeline(PARSED_COMMAND *Cmd) { #ifdef FEATURE_REDIRECTION - HANDLE hInput = NULL; - HANDLE hOldConIn = GetStdHandle(STD_INPUT_HANDLE); - HANDLE hOldConOut = GetStdHandle(STD_OUTPUT_HANDLE); - HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; - INT nProcesses = 0; - DWORD dwExitCode; - - /* Do all but the last pipe command */ - do - { - HANDLE hPipeRead, hPipeWrite; - if (nProcesses > (MAXIMUM_WAIT_OBJECTS - 2)) - { - error_too_many_parameters(_T("|")); - goto failed; - } - - /* Create the pipe that this process will write into. - * Make the handles non-inheritable initially, because this - * process shouldn't inherit the reading handle. */ - if (!CreatePipe(&hPipeRead, &hPipeWrite, NULL, 0)) - { - error_no_pipe(); - goto failed; - } - - /* The writing side of the pipe is STDOUT for this process */ - SetHandleInformation(hPipeWrite, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT); - SetStdHandle(STD_OUTPUT_HANDLE, hPipeWrite); - - /* Execute it (error check is done later for easier cleanup) */ - hProcess[nProcesses] = ExecuteAsync(Cmd->Subcommands); - CloseHandle(hPipeWrite); - if (hInput) - CloseHandle(hInput); - - /* The reading side of the pipe will be STDIN for the next process */ - SetHandleInformation(hPipeRead, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT); - SetStdHandle(STD_INPUT_HANDLE, hPipeRead); - hInput = hPipeRead; - - if (!hProcess[nProcesses]) - goto failed; - nProcesses++; - - Cmd = Cmd->Subcommands->Next; - } while (Cmd->Type == C_PIPE); - - /* The last process uses the original STDOUT */ - SetStdHandle(STD_OUTPUT_HANDLE, hOldConOut); - hProcess[nProcesses] = ExecuteAsync(Cmd); - if (!hProcess[nProcesses]) - goto failed; - nProcesses++; - CloseHandle(hInput); - SetStdHandle(STD_INPUT_HANDLE, hOldConIn); - - /* Wait for all processes to complete */ - EnterCriticalSection(&ChildProcessRunningLock); - WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE); - LeaveCriticalSection(&ChildProcessRunningLock); - - /* Use the exit code of the last process in the pipeline */ - GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode); - nErrorLevel = (INT)dwExitCode; - - while (--nProcesses >= 0) - CloseHandle(hProcess[nProcesses]); - return; + HANDLE hInput = NULL; + HANDLE hOldConIn = GetStdHandle(STD_INPUT_HANDLE); + HANDLE hOldConOut = GetStdHandle(STD_OUTPUT_HANDLE); + HANDLE hProcess[MAXIMUM_WAIT_OBJECTS]; + INT nProcesses = 0; + DWORD dwExitCode; + + /* Do all but the last pipe command */ + do + { + HANDLE hPipeRead, hPipeWrite; + if (nProcesses > (MAXIMUM_WAIT_OBJECTS - 2)) + { + error_too_many_parameters(_T("|")); + goto failed; + } + + /* Create the pipe that this process will write into. + * Make the handles non-inheritable initially, because this + * process shouldn't inherit the reading handle. */ + if (!CreatePipe(&hPipeRead, &hPipeWrite, NULL, 0)) + { + error_no_pipe(); + goto failed; + } + + /* The writing side of the pipe is STDOUT for this process */ + SetHandleInformation(hPipeWrite, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT); + SetStdHandle(STD_OUTPUT_HANDLE, hPipeWrite); + + /* Execute it (error check is done later for easier cleanup) */ + hProcess[nProcesses] = ExecuteAsync(Cmd->Subcommands); + CloseHandle(hPipeWrite); + if (hInput) + CloseHandle(hInput); + + /* The reading side of the pipe will be STDIN for the next process */ + SetHandleInformation(hPipeRead, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT); + SetStdHandle(STD_INPUT_HANDLE, hPipeRead); + hInput = hPipeRead; + + if (!hProcess[nProcesses]) + goto failed; + nProcesses++; + + Cmd = Cmd->Subcommands->Next; + } while (Cmd->Type == C_PIPE); + + /* The last process uses the original STDOUT */ + SetStdHandle(STD_OUTPUT_HANDLE, hOldConOut); + hProcess[nProcesses] = ExecuteAsync(Cmd); + if (!hProcess[nProcesses]) + goto failed; + nProcesses++; + CloseHandle(hInput); + SetStdHandle(STD_INPUT_HANDLE, hOldConIn); + + /* Wait for all processes to complete */ + EnterCriticalSection(&ChildProcessRunningLock); + WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE); + LeaveCriticalSection(&ChildProcessRunningLock); + + /* Use the exit code of the last process in the pipeline */ + GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode); + nErrorLevel = (INT)dwExitCode; + + while (--nProcesses >= 0) + CloseHandle(hProcess[nProcesses]); + return; failed: - if (hInput) - CloseHandle(hInput); - while (--nProcesses >= 0) - { - TerminateProcess(hProcess[nProcesses], 0); - CloseHandle(hProcess[nProcesses]); - } - SetStdHandle(STD_INPUT_HANDLE, hOldConIn); - SetStdHandle(STD_OUTPUT_HANDLE, hOldConOut); + if (hInput) + CloseHandle(hInput); + while (--nProcesses >= 0) + { + TerminateProcess(hProcess[nProcesses], 0); + CloseHandle(hProcess[nProcesses]); + } + SetStdHandle(STD_INPUT_HANDLE, hOldConIn); + SetStdHandle(STD_OUTPUT_HANDLE, hOldConOut); #endif } INT ExecuteCommand(PARSED_COMMAND *Cmd) { - PARSED_COMMAND *Sub; - LPTSTR First, Rest; - INT Ret = 0; - - if (!PerformRedirection(Cmd->Redirections)) - return 1; - - switch (Cmd->Type) - { - case C_COMMAND: - Ret = 1; - First = DoDelayedExpansion(Cmd->Command.First); - if (First) - { - Rest = DoDelayedExpansion(Cmd->Command.Rest); - if (Rest) - { - Ret = DoCommand(First, Rest, Cmd); - cmd_free(Rest); - } - cmd_free(First); - } - break; - case C_QUIET: - case C_BLOCK: - case C_MULTI: - for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) - Ret = ExecuteCommand(Sub); - break; - case C_IFFAILURE: - Sub = Cmd->Subcommands; - Ret = ExecuteCommand(Sub); - if (Ret != 0) - { - nErrorLevel = Ret; - Ret = ExecuteCommand(Sub->Next); - } - break; - case C_IFSUCCESS: - Sub = Cmd->Subcommands; - Ret = ExecuteCommand(Sub); - if (Ret == 0) - Ret = ExecuteCommand(Sub->Next); - break; - case C_PIPE: - ExecutePipeline(Cmd); - break; - case C_IF: - Ret = ExecuteIf(Cmd); - break; - case C_FOR: - Ret = ExecuteFor(Cmd); - break; - } - - UndoRedirection(Cmd->Redirections, NULL); - return Ret; + PARSED_COMMAND *Sub; + LPTSTR First, Rest; + INT Ret = 0; + + if (!PerformRedirection(Cmd->Redirections)) + return 1; + + switch (Cmd->Type) + { + case C_COMMAND: + Ret = 1; + First = DoDelayedExpansion(Cmd->Command.First); + if (First) + { + Rest = DoDelayedExpansion(Cmd->Command.Rest); + if (Rest) + { + Ret = DoCommand(First, Rest, Cmd); + cmd_free(Rest); + } + cmd_free(First); + } + break; + case C_QUIET: + case C_BLOCK: + case C_MULTI: + for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) + Ret = ExecuteCommand(Sub); + break; + case C_IFFAILURE: + Sub = Cmd->Subcommands; + Ret = ExecuteCommand(Sub); + if (Ret != 0) + { + nErrorLevel = Ret; + Ret = ExecuteCommand(Sub->Next); + } + break; + case C_IFSUCCESS: + Sub = Cmd->Subcommands; + Ret = ExecuteCommand(Sub); + if (Ret == 0) + Ret = ExecuteCommand(Sub->Next); + break; + case C_PIPE: + ExecutePipeline(Cmd); + break; + case C_IF: + Ret = ExecuteIf(Cmd); + break; + case C_FOR: + Ret = ExecuteFor(Cmd); + break; + } + + UndoRedirection(Cmd->Redirections, NULL); + return Ret; } LPTSTR GetEnvVar(LPCTSTR varName) { - static LPTSTR ret = NULL; - UINT size; - - cmd_free(ret); - ret = NULL; - size = GetEnvironmentVariable(varName, NULL, 0); - if (size > 0) - { - ret = cmd_alloc(size * sizeof(TCHAR)); - if (ret != NULL) - GetEnvironmentVariable(varName, ret, size + 1); - } - return ret; + static LPTSTR ret = NULL; + UINT size; + + cmd_free(ret); + ret = NULL; + size = GetEnvironmentVariable(varName, NULL, 0); + if (size > 0) + { + ret = cmd_alloc(size * sizeof(TCHAR)); + if (ret != NULL) + GetEnvironmentVariable(varName, ret, size + 1); + } + return ret; } LPCTSTR GetEnvVarOrSpecial(LPCTSTR varName) { - static TCHAR ret[MAX_PATH]; - - LPTSTR var = GetEnvVar(varName); - if (var) - return var; - - /* env var doesn't exist, look for a "special" one */ - /* %CD% */ - if (_tcsicmp(varName,_T("cd")) ==0) - { - GetCurrentDirectory(MAX_PATH, ret); - return ret; - } - /* %TIME% */ - else if (_tcsicmp(varName,_T("time")) ==0) - { - return GetTimeString(); - } - /* %DATE% */ - else if (_tcsicmp(varName,_T("date")) ==0) - { - return GetDateString(); - } - - /* %RANDOM% */ - else if (_tcsicmp(varName,_T("random")) ==0) - { - /* Get random number */ - _itot(rand(),ret,10); - return ret; - } - - /* %CMDCMDLINE% */ - else if (_tcsicmp(varName,_T("cmdcmdline")) ==0) - { - return GetCommandLine(); - } - - /* %CMDEXTVERSION% */ - else if (_tcsicmp(varName,_T("cmdextversion")) ==0) - { - /* Set version number to 2 */ - _itot(2,ret,10); - return ret; - } - - /* %ERRORLEVEL% */ - else if (_tcsicmp(varName,_T("errorlevel")) ==0) - { - _itot(nErrorLevel,ret,10); - return ret; - } - - return NULL; + static TCHAR ret[MAX_PATH]; + + LPTSTR var = GetEnvVar(varName); + if (var) + return var; + + /* env var doesn't exist, look for a "special" one */ + /* %CD% */ + if (_tcsicmp(varName,_T("cd")) ==0) + { + GetCurrentDirectory(MAX_PATH, ret); + return ret; + } + /* %TIME% */ + else if (_tcsicmp(varName,_T("time")) ==0) + { + return GetTimeString(); + } + /* %DATE% */ + else if (_tcsicmp(varName,_T("date")) ==0) + { + return GetDateString(); + } + + /* %RANDOM% */ + else if (_tcsicmp(varName,_T("random")) ==0) + { + /* Get random number */ + _itot(rand(),ret,10); + return ret; + } + + /* %CMDCMDLINE% */ + else if (_tcsicmp(varName,_T("cmdcmdline")) ==0) + { + return GetCommandLine(); + } + + /* %CMDEXTVERSION% */ + else if (_tcsicmp(varName,_T("cmdextversion")) ==0) + { + /* Set version number to 2 */ + _itot(2,ret,10); + return ret; + } + + /* %ERRORLEVEL% */ + else if (_tcsicmp(varName,_T("errorlevel")) ==0) + { + _itot(nErrorLevel,ret,10); + return ret; + } + + return NULL; } /* Handle the %~var syntax */ static LPTSTR GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) { - static const TCHAR ModifierTable[] = _T("dpnxfsatz"); - enum { - M_DRIVE = 1, /* D: drive letter */ - M_PATH = 2, /* P: path */ - M_NAME = 4, /* N: filename */ - M_EXT = 8, /* X: extension */ - M_FULL = 16, /* F: full path (drive+path+name+ext) */ - M_SHORT = 32, /* S: full path (drive+path+name+ext), use short names */ - M_ATTR = 64, /* A: attributes */ - M_TIME = 128, /* T: modification time */ - M_SIZE = 256, /* Z: file size */ - } Modifiers = 0; - - TCHAR *Format, *FormatEnd; - TCHAR *PathVarName = NULL; - LPTSTR Variable; - TCHAR *VarEnd; - BOOL VariableIsParam0; - TCHAR FullPath[MAX_PATH]; - TCHAR FixedPath[MAX_PATH], *Filename, *Extension; - HANDLE hFind; - WIN32_FIND_DATA w32fd; - TCHAR *In, *Out; - - static TCHAR Result[CMDLINE_LENGTH]; - - /* There is ambiguity between modifier characters and FOR variables; - * the rule that cmd uses is to pick the longest possible match. - * For example, if there is a %n variable, then out of %~anxnd, - * %~anxn will be substituted rather than just %~an. */ - - /* First, go through as many modifier characters as possible */ - FormatEnd = Format = *pFormat; - while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) - FormatEnd++; - - if (*FormatEnd == _T('$')) - { - /* $PATH: syntax */ - PathVarName = FormatEnd + 1; - FormatEnd = _tcschr(PathVarName, _T(':')); - if (!FormatEnd) - return NULL; - - /* Must be immediately followed by the variable */ - Variable = GetVar(*++FormatEnd, &VariableIsParam0); - if (!Variable) - return NULL; - } - else - { - /* Backtrack if necessary to get a variable name match */ - while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) - { - if (FormatEnd == Format) - return NULL; - FormatEnd--; - } - } - - for (; Format < FormatEnd && *Format != _T('$'); Format++) - Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); - - *pFormat = FormatEnd + 1; - - /* Exclude the leading and trailing quotes */ - VarEnd = &Variable[_tcslen(Variable)]; - if (*Variable == _T('"')) - { - Variable++; - if (VarEnd > Variable && VarEnd[-1] == _T('"')) - VarEnd--; - } - - if ((char *)VarEnd - (char *)Variable >= sizeof Result) - return _T(""); - memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); - Result[VarEnd - Variable] = _T('\0'); - - if (PathVarName) - { - /* $PATH: syntax - search the directories listed in the - * specified environment variable for the file */ - LPTSTR PathVar; - FormatEnd[-1] = _T('\0'); - PathVar = GetEnvVar(PathVarName); - FormatEnd[-1] = _T(':'); - if (!PathVar || - !SearchPath(PathVar, Result, NULL, MAX_PATH, FullPath, NULL)) - { - return _T(""); - } - } - else if (Modifiers == 0) - { - /* For plain %~var with no modifiers, just return the variable without quotes */ - return Result; - } - else if (VariableIsParam0) - { - /* Special case: If the variable is %0 and modifier characters are present, - * use the batch file's path (which includes the .bat/.cmd extension) - * rather than the actual %0 variable (which might not). */ - _tcscpy(FullPath, bc->BatchFilePath); - } - else - { - /* Convert the variable, now without quotes, to a full path */ - if (!GetFullPathName(Result, MAX_PATH, FullPath, NULL)) - return _T(""); - } - - /* Next step is to change the path to fix letter case (e.g. - * C:\ReAcToS -> C:\ReactOS) and, if requested with the S modifier, - * replace long filenames with short. */ - - In = FullPath; - Out = FixedPath; - - /* Copy drive letter */ - *Out++ = *In++; - *Out++ = *In++; - *Out++ = *In++; - /* Loop over each \-separated component in the path */ - do { - TCHAR *Next = _tcschr(In, _T('\\')); - if (Next) - *Next++ = _T('\0'); - /* Use FindFirstFile to get the correct name */ - if (Out + _tcslen(In) + 1 >= &FixedPath[MAX_PATH]) - return _T(""); - _tcscpy(Out, In); - hFind = FindFirstFile(FixedPath, &w32fd); - /* If it doesn't exist, just leave the name as it was given */ - if (hFind != INVALID_HANDLE_VALUE) - { - LPTSTR FixedComponent = w32fd.cFileName; - if (*w32fd.cAlternateFileName && - ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) - { - FixedComponent = w32fd.cAlternateFileName; - } - FindClose(hFind); - - if (Out + _tcslen(FixedComponent) + 1 >= &FixedPath[MAX_PATH]) - return _T(""); - _tcscpy(Out, FixedComponent); - } - Filename = Out; - Out += _tcslen(Out); - *Out++ = _T('\\'); - - In = Next; - } while (In != NULL); - Out[-1] = _T('\0'); - - /* Build the result string. Start with attributes, modification time, and - * file size. If the file didn't exist, these fields will all be empty. */ - Out = Result; - if (hFind != INVALID_HANDLE_VALUE) - { - if (Modifiers & M_ATTR) - { - static const struct { - TCHAR Character; - WORD Value; - } *Attrib, Table[] = { - { _T('d'), FILE_ATTRIBUTE_DIRECTORY }, - { _T('r'), FILE_ATTRIBUTE_READONLY }, - { _T('a'), FILE_ATTRIBUTE_ARCHIVE }, - { _T('h'), FILE_ATTRIBUTE_HIDDEN }, - { _T('s'), FILE_ATTRIBUTE_SYSTEM }, - { _T('c'), FILE_ATTRIBUTE_COMPRESSED }, - { _T('o'), FILE_ATTRIBUTE_OFFLINE }, - { _T('t'), FILE_ATTRIBUTE_TEMPORARY }, - { _T('l'), FILE_ATTRIBUTE_REPARSE_POINT }, - }; - for (Attrib = Table; Attrib != &Table[9]; Attrib++) - { - *Out++ = w32fd.dwFileAttributes & Attrib->Value - ? Attrib->Character - : _T('-'); - } - *Out++ = _T(' '); - } - if (Modifiers & M_TIME) - { - FILETIME ft; - SYSTEMTIME st; - FileTimeToLocalFileTime(&w32fd.ftLastWriteTime, &ft); - FileTimeToSystemTime(&ft, &st); - - Out += FormatDate(Out, &st, TRUE); - *Out++ = _T(' '); - Out += FormatTime(Out, &st); - *Out++ = _T(' '); - } - if (Modifiers & M_SIZE) - { - ULARGE_INTEGER Size; - Size.LowPart = w32fd.nFileSizeLow; - Size.HighPart = w32fd.nFileSizeHigh; - Out += _stprintf(Out, _T("%I64u "), Size.QuadPart); - } - } - - /* When using the path-searching syntax or the S modifier, - * at least part of the file path is always included. - * If none of the DPNX modifiers are present, include the full path */ - if (PathVarName || (Modifiers & M_SHORT)) - if ((Modifiers & (M_DRIVE | M_PATH | M_NAME | M_EXT)) == 0) - Modifiers |= M_FULL; - - /* Now add the requested parts of the name. - * With the F modifier, add all parts to form the full path. */ - Extension = _tcsrchr(Filename, _T('.')); - if (Modifiers & (M_DRIVE | M_FULL)) - { - *Out++ = FixedPath[0]; - *Out++ = FixedPath[1]; - } - if (Modifiers & (M_PATH | M_FULL)) - { - memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); - Out += Filename - &FixedPath[2]; - } - if (Modifiers & (M_NAME | M_FULL)) - { - while (*Filename && Filename != Extension) - *Out++ = *Filename++; - } - if (Modifiers & (M_EXT | M_FULL)) - { - if (Extension) - Out = _stpcpy(Out, Extension); - } - - /* Trim trailing space which otherwise would appear as a - * result of using the A/T/Z modifiers but no others. */ - while (Out != &Result[0] && Out[-1] == _T(' ')) - Out--; - *Out = _T('\0'); - - return Result; + static const TCHAR ModifierTable[] = _T("dpnxfsatz"); + enum { + M_DRIVE = 1, /* D: drive letter */ + M_PATH = 2, /* P: path */ + M_NAME = 4, /* N: filename */ + M_EXT = 8, /* X: extension */ + M_FULL = 16, /* F: full path (drive+path+name+ext) */ + M_SHORT = 32, /* S: full path (drive+path+name+ext), use short names */ + M_ATTR = 64, /* A: attributes */ + M_TIME = 128, /* T: modification time */ + M_SIZE = 256, /* Z: file size */ + } Modifiers = 0; + + TCHAR *Format, *FormatEnd; + TCHAR *PathVarName = NULL; + LPTSTR Variable; + TCHAR *VarEnd; + BOOL VariableIsParam0; + TCHAR FullPath[MAX_PATH]; + TCHAR FixedPath[MAX_PATH], *Filename, *Extension; + HANDLE hFind; + WIN32_FIND_DATA w32fd; + TCHAR *In, *Out; + + static TCHAR Result[CMDLINE_LENGTH]; + + /* There is ambiguity between modifier characters and FOR variables; + * the rule that cmd uses is to pick the longest possible match. + * For example, if there is a %n variable, then out of %~anxnd, + * %~anxn will be substituted rather than just %~an. */ + + /* First, go through as many modifier characters as possible */ + FormatEnd = Format = *pFormat; + while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) + FormatEnd++; + + if (*FormatEnd == _T('$')) + { + /* $PATH: syntax */ + PathVarName = FormatEnd + 1; + FormatEnd = _tcschr(PathVarName, _T(':')); + if (!FormatEnd) + return NULL; + + /* Must be immediately followed by the variable */ + Variable = GetVar(*++FormatEnd, &VariableIsParam0); + if (!Variable) + return NULL; + } + else + { + /* Backtrack if necessary to get a variable name match */ + while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + { + if (FormatEnd == Format) + return NULL; + FormatEnd--; + } + } + + for (; Format < FormatEnd && *Format != _T('$'); Format++) + Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); + + *pFormat = FormatEnd + 1; + + /* Exclude the leading and trailing quotes */ + VarEnd = &Variable[_tcslen(Variable)]; + if (*Variable == _T('"')) + { + Variable++; + if (VarEnd > Variable && VarEnd[-1] == _T('"')) + VarEnd--; + } + + if ((char *)VarEnd - (char *)Variable >= sizeof Result) + return _T(""); + memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); + Result[VarEnd - Variable] = _T('\0'); + + if (PathVarName) + { + /* $PATH: syntax - search the directories listed in the + * specified environment variable for the file */ + LPTSTR PathVar; + FormatEnd[-1] = _T('\0'); + PathVar = GetEnvVar(PathVarName); + FormatEnd[-1] = _T(':'); + if (!PathVar || + !SearchPath(PathVar, Result, NULL, MAX_PATH, FullPath, NULL)) + { + return _T(""); + } + } + else if (Modifiers == 0) + { + /* For plain %~var with no modifiers, just return the variable without quotes */ + return Result; + } + else if (VariableIsParam0) + { + /* Special case: If the variable is %0 and modifier characters are present, + * use the batch file's path (which includes the .bat/.cmd extension) + * rather than the actual %0 variable (which might not). */ + _tcscpy(FullPath, bc->BatchFilePath); + } + else + { + /* Convert the variable, now without quotes, to a full path */ + if (!GetFullPathName(Result, MAX_PATH, FullPath, NULL)) + return _T(""); + } + + /* Next step is to change the path to fix letter case (e.g. + * C:\ReAcToS -> C:\ReactOS) and, if requested with the S modifier, + * replace long filenames with short. */ + + In = FullPath; + Out = FixedPath; + + /* Copy drive letter */ + *Out++ = *In++; + *Out++ = *In++; + *Out++ = *In++; + /* Loop over each \-separated component in the path */ + do { + TCHAR *Next = _tcschr(In, _T('\\')); + if (Next) + *Next++ = _T('\0'); + /* Use FindFirstFile to get the correct name */ + if (Out + _tcslen(In) + 1 >= &FixedPath[MAX_PATH]) + return _T(""); + _tcscpy(Out, In); + hFind = FindFirstFile(FixedPath, &w32fd); + /* If it doesn't exist, just leave the name as it was given */ + if (hFind != INVALID_HANDLE_VALUE) + { + LPTSTR FixedComponent = w32fd.cFileName; + if (*w32fd.cAlternateFileName && + ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) + { + FixedComponent = w32fd.cAlternateFileName; + } + FindClose(hFind); + + if (Out + _tcslen(FixedComponent) + 1 >= &FixedPath[MAX_PATH]) + return _T(""); + _tcscpy(Out, FixedComponent); + } + Filename = Out; + Out += _tcslen(Out); + *Out++ = _T('\\'); + + In = Next; + } while (In != NULL); + Out[-1] = _T('\0'); + + /* Build the result string. Start with attributes, modification time, and + * file size. If the file didn't exist, these fields will all be empty. */ + Out = Result; + if (hFind != INVALID_HANDLE_VALUE) + { + if (Modifiers & M_ATTR) + { + static const struct { + TCHAR Character; + WORD Value; + } *Attrib, Table[] = { + { _T('d'), FILE_ATTRIBUTE_DIRECTORY }, + { _T('r'), FILE_ATTRIBUTE_READONLY }, + { _T('a'), FILE_ATTRIBUTE_ARCHIVE }, + { _T('h'), FILE_ATTRIBUTE_HIDDEN }, + { _T('s'), FILE_ATTRIBUTE_SYSTEM }, + { _T('c'), FILE_ATTRIBUTE_COMPRESSED }, + { _T('o'), FILE_ATTRIBUTE_OFFLINE }, + { _T('t'), FILE_ATTRIBUTE_TEMPORARY }, + { _T('l'), FILE_ATTRIBUTE_REPARSE_POINT }, + }; + for (Attrib = Table; Attrib != &Table[9]; Attrib++) + { + *Out++ = w32fd.dwFileAttributes & Attrib->Value + ? Attrib->Character + : _T('-'); + } + *Out++ = _T(' '); + } + if (Modifiers & M_TIME) + { + FILETIME ft; + SYSTEMTIME st; + FileTimeToLocalFileTime(&w32fd.ftLastWriteTime, &ft); + FileTimeToSystemTime(&ft, &st); + + Out += FormatDate(Out, &st, TRUE); + *Out++ = _T(' '); + Out += FormatTime(Out, &st); + *Out++ = _T(' '); + } + if (Modifiers & M_SIZE) + { + ULARGE_INTEGER Size; + Size.LowPart = w32fd.nFileSizeLow; + Size.HighPart = w32fd.nFileSizeHigh; + Out += _stprintf(Out, _T("%I64u "), Size.QuadPart); + } + } + + /* When using the path-searching syntax or the S modifier, + * at least part of the file path is always included. + * If none of the DPNX modifiers are present, include the full path */ + if (PathVarName || (Modifiers & M_SHORT)) + if ((Modifiers & (M_DRIVE | M_PATH | M_NAME | M_EXT)) == 0) + Modifiers |= M_FULL; + + /* Now add the requested parts of the name. + * With the F modifier, add all parts to form the full path. */ + Extension = _tcsrchr(Filename, _T('.')); + if (Modifiers & (M_DRIVE | M_FULL)) + { + *Out++ = FixedPath[0]; + *Out++ = FixedPath[1]; + } + if (Modifiers & (M_PATH | M_FULL)) + { + memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); + Out += Filename - &FixedPath[2]; + } + if (Modifiers & (M_NAME | M_FULL)) + { + while (*Filename && Filename != Extension) + *Out++ = *Filename++; + } + if (Modifiers & (M_EXT | M_FULL)) + { + if (Extension) + Out = _stpcpy(Out, Extension); + } + + /* Trim trailing space which otherwise would appear as a + * result of using the A/T/Z modifiers but no others. */ + while (Out != &Result[0] && Out[-1] == _T(' ')) + Out--; + *Out = _T('\0'); + + return Result; } LPCTSTR GetBatchVar(TCHAR *varName, UINT *varNameLen) { - LPCTSTR ret; - TCHAR *varNameEnd; - BOOL dummy; - - *varNameLen = 1; - - switch ( *varName ) - { - case _T('~'): - varNameEnd = varName + 1; - ret = GetEnhancedVar(&varNameEnd, FindArg); - if (!ret) - { - error_syntax(varName); - return NULL; - } - *varNameLen = varNameEnd - varName; - return ret; - case _T('0'): - case _T('1'): - case _T('2'): - case _T('3'): - case _T('4'): - case _T('5'): - case _T('6'): - case _T('7'): - case _T('8'): - case _T('9'): - return FindArg(*varName, &dummy); + LPCTSTR ret; + TCHAR *varNameEnd; + BOOL dummy; + + *varNameLen = 1; + + switch ( *varName ) + { + case _T('~'): + varNameEnd = varName + 1; + ret = GetEnhancedVar(&varNameEnd, FindArg); + if (!ret) + { + error_syntax(varName); + return NULL; + } + *varNameLen = varNameEnd - varName; + return ret; + case _T('0'): + case _T('1'): + case _T('2'): + case _T('3'): + case _T('4'): + case _T('5'): + case _T('6'): + case _T('7'): + case _T('8'): + case _T('9'): + return FindArg(*varName, &dummy); case _T('*'): // @@ -1127,161 +1124,161 @@ // return bc->raw_params; - case _T('%'): - return _T("%"); - } - return NULL; + case _T('%'): + return _T("%"); + } + return NULL; } BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) { #define APPEND(From, Length) { \ - if (Dest + (Length) > DestEnd) \ - goto too_long; \ - memcpy(Dest, From, (Length) * sizeof(TCHAR)); \ - Dest += Length; } + if (Dest + (Length) > DestEnd) \ + goto too_long; \ + memcpy(Dest, From, (Length) * sizeof(TCHAR)); \ + Dest += Length; } #define APPEND1(Char) { \ - if (Dest >= DestEnd) \ - goto too_long; \ - *Dest++ = Char; } - - TCHAR *DestEnd = Dest + CMDLINE_LENGTH - 1; - const TCHAR *Var; - int VarLength; - TCHAR *SubstStart; - TCHAR EndChr; - while (*Src) - { - if (*Src != Delim) - { - APPEND1(*Src++) - continue; - } - - Src++; - if (bc && Delim == _T('%')) - { - UINT NameLen; - Var = GetBatchVar(Src, &NameLen); - if (Var != NULL) - { - VarLength = _tcslen(Var); - APPEND(Var, VarLength) - Src += NameLen; - continue; - } - } - - /* Find the end of the variable name. A colon (:) will usually - * end the name and begin the optional modifier, but not if it - * is immediately followed by the delimiter (%VAR:%). */ - SubstStart = Src; - while (*Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) - { - if (!*Src) - goto bad_subst; - Src++; - } - - EndChr = *Src; - *Src = _T('\0'); - Var = GetEnvVarOrSpecial(SubstStart); - *Src++ = EndChr; - if (Var == NULL) - { - /* In a batch file, %NONEXISTENT% "expands" to an empty string */ - if (bc) - continue; - goto bad_subst; - } - VarLength = _tcslen(Var); - - if (EndChr == Delim) - { - /* %VAR% - use as-is */ - APPEND(Var, VarLength) - } - else if (*Src == _T('~')) - { - /* %VAR:~[start][,length]% - substring - * Negative values are offsets from the end */ - int Start = _tcstol(Src + 1, &Src, 0); - int End = VarLength; - if (Start < 0) - Start += VarLength; - Start = max(Start, 0); - Start = min(Start, VarLength); - if (*Src == _T(',')) - { - End = _tcstol(Src + 1, &Src, 0); - End += (End < 0) ? VarLength : Start; - End = max(End, Start); - End = min(End, VarLength); - } - if (*Src++ != Delim) - goto bad_subst; - APPEND(&Var[Start], End - Start); - } - else - { - /* %VAR:old=new% - replace all occurrences of old with new - * %VAR:*old=new% - replace first occurrence only, - * and remove everything before it */ - TCHAR *Old, *New; - DWORD OldLength, NewLength; - BOOL Star = FALSE; - int LastMatch = 0, i = 0; - - if (*Src == _T('*')) - { - Star = TRUE; - Src++; - } - - /* the string to replace may contain the delimiter */ - Src = _tcschr(Old = Src, _T('=')); - if (Src == NULL) - goto bad_subst; - OldLength = Src++ - Old; - if (OldLength == 0) - goto bad_subst; - - Src = _tcschr(New = Src, Delim); - if (Src == NULL) - goto bad_subst; - NewLength = Src++ - New; - - while (i < VarLength) - { - if (_tcsnicmp(&Var[i], Old, OldLength) == 0) - { - if (!Star) - APPEND(&Var[LastMatch], i - LastMatch) - APPEND(New, NewLength) - i += OldLength; - LastMatch = i; - if (Star) - break; - continue; - } - i++; - } - APPEND(&Var[LastMatch], VarLength - LastMatch) - } - continue; - - bad_subst: - Src = SubstStart; - if (!bc) - APPEND1(Delim) - } - *Dest = _T('\0'); - return TRUE; + if (Dest >= DestEnd) \ + goto too_long; \ + *Dest++ = Char; } + + TCHAR *DestEnd = Dest + CMDLINE_LENGTH - 1; + const TCHAR *Var; + int VarLength; + TCHAR *SubstStart; + TCHAR EndChr; + while (*Src) + { + if (*Src != Delim) + { + APPEND1(*Src++) + continue; + } + + Src++; + if (bc && Delim == _T('%')) + { + UINT NameLen; + Var = GetBatchVar(Src, &NameLen); + if (Var != NULL) + { + VarLength = _tcslen(Var); + APPEND(Var, VarLength) + Src += NameLen; + continue; + } + } + + /* Find the end of the variable name. A colon (:) will usually + * end the name and begin the optional modifier, but not if it + * is immediately followed by the delimiter (%VAR:%). */ + SubstStart = Src; + while (*Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + { + if (!*Src) + goto bad_subst; + Src++; + } + + EndChr = *Src; + *Src = _T('\0'); + Var = GetEnvVarOrSpecial(SubstStart); + *Src++ = EndChr; + if (Var == NULL) + { + /* In a batch file, %NONEXISTENT% "expands" to an empty string */ + if (bc) + continue; + goto bad_subst; + } + VarLength = _tcslen(Var); + + if (EndChr == Delim) + { + /* %VAR% - use as-is */ + APPEND(Var, VarLength) + } + else if (*Src == _T('~')) + { + /* %VAR:~[start][,length]% - substring + * Negative values are offsets from the end */ + int Start = _tcstol(Src + 1, &Src, 0); + int End = VarLength; + if (Start < 0) + Start += VarLength; + Start = max(Start, 0); + Start = min(Start, VarLength); + if (*Src == _T(',')) + { + End = _tcstol(Src + 1, &Src, 0); + End += (End < 0) ? VarLength : Start; + End = max(End, Start); + End = min(End, VarLength); + } + if (*Src++ != Delim) + goto bad_subst; + APPEND(&Var[Start], End - Start); + } + else + { + /* %VAR:old=new% - replace all occurrences of old with new + * %VAR:*old=new% - replace first occurrence only, + * and remove everything before it */ + TCHAR *Old, *New; + DWORD OldLength, NewLength; + BOOL Star = FALSE; + int LastMatch = 0, i = 0; + + if (*Src == _T('*')) + { + Star = TRUE; + Src++; + } + + /* the string to replace may contain the delimiter */ + Src = _tcschr(Old = Src, _T('=')); + if (Src == NULL) + goto bad_subst; + OldLength = Src++ - Old; + if (OldLength == 0) + goto bad_subst; + + Src = _tcschr(New = Src, Delim); + if (Src == NULL) + goto bad_subst; + NewLength = Src++ - New; + + while (i < VarLength) + { + if (_tcsnicmp(&Var[i], Old, OldLength) == 0) + { + if (!Star) + APPEND(&Var[LastMatch], i - LastMatch) + APPEND(New, NewLength) + i += OldLength; + LastMatch = i; + if (Star) + break; + continue; + } + i++; + } + APPEND(&Var[LastMatch], VarLength - LastMatch) + } + continue; + + bad_subst: + Src = SubstStart; + if (!bc) + APPEND1(Delim) + } + *Dest = _T('\0'); + return TRUE; too_long: - ConOutResPrintf(STRING_ALIAS_ERROR); - nErrorLevel = 9023; - return FALSE; + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return FALSE; #undef APPEND #undef APPEND1 } @@ -1289,69 +1286,71 @@ /* Search the list of FOR contexts for a variable */ static LPTSTR FindForVar(TCHAR Var, BOOL *IsParam0) { - FOR_CONTEXT *Ctx; - *IsParam0 = FALSE; - for (Ctx = fc; Ctx != NULL; Ctx = Ctx->prev) - if ((UINT)(Var - Ctx->firstvar) < Ctx->varcount) - return Ctx->values[Var - Ctx->firstvar]; - return NULL; + FOR_CONTEXT *Ctx; + *IsParam0 = FALSE; + for (Ctx = fc; Ctx != NULL; Ctx = Ctx->prev) + { + if ((UINT)(Var - Ctx->firstvar) < Ctx->varcount) + return Ctx->values[Var - Ctx->firstvar]; + } + return NULL; } BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest) { - TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; - while (*Src) - { - if (Src[0] == _T('%')) - { - BOOL Dummy; - LPTSTR End = &Src[2]; - LPTSTR Value = NULL; - - if (Src[1] == _T('~')) - Value = GetEnhancedVar(&End, FindForVar); - - if (!Value) - Value = FindForVar(Src[1], &Dummy); - - if (Value) - { - if (Dest + _tcslen(Value) > DestEnd) - return FALSE; - Dest = _stpcpy(Dest, Value); - Src = End; - continue; - } - } - /* Not a variable; just copy the character */ - if (Dest >= DestEnd) - return FALSE; - *Dest++ = *Src++; - } - *Dest = _T('\0'); - return TRUE; + TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; + while (*Src) + { + if (Src[0] == _T('%')) + { + BOOL Dummy; + LPTSTR End = &Src[2]; + LPTSTR Value = NULL; + + if (Src[1] == _T('~')) + Value = GetEnhancedVar(&End, FindForVar); + + if (!Value) + Value = FindForVar(Src[1], &Dummy); + + if (Value) + { + if (Dest + _tcslen(Value) > DestEnd) + return FALSE; + Dest = _stpcpy(Dest, Value); + Src = End; + continue; + } + } + /* Not a variable; just copy the character */ + if (Dest >= DestEnd) + return FALSE; + *Dest++ = *Src++; + } + *Dest = _T('\0'); + return TRUE; } LPTSTR DoDelayedExpansion(LPTSTR Line) { - TCHAR Buf1[CMDLINE_LENGTH]; - TCHAR Buf2[CMDLINE_LENGTH]; - - /* First, substitute FOR variables */ - if (!SubstituteForVars(Line, Buf1)) - return NULL; - - if (!bDelayedExpansion || !_tcschr(Buf1, _T('!'))) - return cmd_dup(Buf1); - - /* FIXME: Delayed substitutions actually aren't quite the same as - * immediate substitutions. In particular, it's possible to escape - * the exclamation point using ^. */ - if (!SubstituteVars(Buf1, Buf2, _T('!'))) - return NULL; - return cmd_dup(Buf2); + TCHAR Buf1[CMDLINE_LENGTH]; + TCHAR Buf2[CMDLINE_LENGTH]; + + /* First, substitute FOR variables */ + if (!SubstituteForVars(Line, Buf1)) + return NULL; + + if (!bDelayedExpansion || !_tcschr(Buf1, _T('!'))) + return cmd_dup(Buf1); + + /* FIXME: Delayed substitutions actually aren't quite the same as + * immediate substitutions. In particular, it's possible to escape + * the exclamation point using ^. */ + if (!SubstituteVars(Buf1, Buf2, _T('!'))) + return NULL; + return cmd_dup(Buf2); } @@ -1363,64 +1362,64 @@ BOOL ReadLine (TCHAR *commandline, BOOL bMore) { - TCHAR readline[CMDLINE_LENGTH]; - LPTSTR ip; - - /* if no batch input then... */ - if (bc == NULL) - { - if (bMore) - { - ConOutResPrintf(STRING_MORE); - } - else - { - /* JPP 19980807 - if echo off, don't print prompt */ - if (bEcho) - { - if (!bIgnoreEcho) - ConOutChar('\n'); - PrintPrompt(); - } - } - - if (!ReadCommand(readline, CMDLINE_LENGTH - 1)) - { - bExit = TRUE; - return FALSE; - } - - if (CheckCtrlBreak(BREAK_INPUT)) - { - ConOutPuts(_T("\n")); - return FALSE; - } - ip = readline; - } - else - { - ip = ReadBatchLine(); - if (!ip) - return FALSE; - } - - return SubstituteVars(ip, commandline, _T('%')); + TCHAR readline[CMDLINE_LENGTH]; + LPTSTR ip; + + /* if no batch input then... */ + if (bc == NULL) + { + if (bMore) + { + ConOutResPrintf(STRING_MORE); + } + else + { + /* JPP 19980807 - if echo off, don't print prompt */ + if (bEcho) + { + if (!bIgnoreEcho) + ConOutChar('\n'); + PrintPrompt(); + } + } + + if (!ReadCommand(readline, CMDLINE_LENGTH - 1)) + { + bExit = TRUE; + return FALSE; + } + + if (CheckCtrlBreak(BREAK_INPUT)) + { + ConOutPuts(_T("\n")); + return FALSE; + } + ip = readline; + } + else + { + ip = ReadBatchLine(); + if (!ip) + return FALSE; + } + + return SubstituteVars(ip, commandline, _T('%')); } static VOID ProcessInput() { - PARSED_COMMAND *Cmd; - - while (!bCanExit || !bExit) - { - Cmd = ParseCommand(NULL); - if (!Cmd) - continue; - - ExecuteCommand(Cmd); - FreeCommand(Cmd); - } + PARSED_COMMAND *Cmd; + + while (!bCanExit || !bExit) + { + Cmd = ParseCommand(NULL); + if (!Cmd) + continue; + + ExecuteCommand(Cmd); + FreeCommand(Cmd); + } } @@ -1429,35 +1428,34 @@ */ BOOL WINAPI BreakHandler (DWORD dwCtrlType) { - - DWORD dwWritten; - INPUT_RECORD rec; - static BOOL SelfGenerated = FALSE; - - if ((dwCtrlType != CTRL_C_EVENT) && - (dwCtrlType != CTRL_BREAK_EVENT)) - { - return FALSE; - } - else - { - if(SelfGenerated) - { - SelfGenerated = FALSE; - return TRUE; - } - } - - if (!TryEnterCriticalSection(&ChildProcessRunningLock)) - { - SelfGenerated = TRUE; - GenerateConsoleCtrlEvent (dwCtrlType, 0); - return TRUE; - } - else - { - LeaveCriticalSection(&ChildProcessRunningLock); - } + DWORD dwWritten; + INPUT_RECORD rec; + static BOOL SelfGenerated = FALSE; + + if ((dwCtrlType != CTRL_C_EVENT) && + (dwCtrlType != CTRL_BREAK_EVENT)) + { + return FALSE; + } + else + { + if(SelfGenerated) + { + SelfGenerated = FALSE; + return TRUE; + } + } + + if (!TryEnterCriticalSection(&ChildProcessRunningLock)) + { + SelfGenerated = TRUE; + GenerateConsoleCtrlEvent (dwCtrlType, 0); + return TRUE; + } + else + { + LeaveCriticalSection(&ChildProcessRunningLock); + } rec.EventType = KEY_EVENT; rec.Event.KeyEvent.bKeyDown = TRUE; @@ -1468,31 +1466,29 @@ rec.Event.KeyEvent.uChar.UnicodeChar = _T('C'); rec.Event.KeyEvent.dwControlKeyState = RIGHT_CTRL_PRESSED; - WriteConsoleInput( - hIn, - &rec, - 1, - &dwWritten); - - bCtrlBreak = TRUE; - /* FIXME: Handle batch files */ - - //ConOutPrintf(_T("^C")); - - - return TRUE; + WriteConsoleInput(hIn, + &rec, + 1, + &dwWritten); + + bCtrlBreak = TRUE; + /* FIXME: Handle batch files */ + + //ConOutPrintf(_T("^C")); + + return TRUE; } VOID AddBreakHandler (VOID) { - SetConsoleCtrlHandler ((PHANDLER_ROUTINE)BreakHandler, TRUE); + SetConsoleCtrlHandler ((PHANDLER_ROUTINE)BreakHandler, TRUE); } VOID RemoveBreakHandler (VOID) { - SetConsoleCtrlHandler ((PHANDLER_ROUTINE)BreakHandler, FALSE); + SetConsoleCtrlHandler ((PHANDLER_ROUTINE)BreakHandler, FALSE); } @@ -1504,56 +1500,56 @@ static VOID ShowCommands (VOID) { - /* print command list */ - ConOutResPuts(STRING_CMD_HELP1); - PrintCommandList(); - - /* print feature list */ - ConOutResPuts(STRING_CMD_HELP2); + /* print command list */ + ConOutResPuts(STRING_CMD_HELP1); + PrintCommandList(); + + /* print feature list */ + ConOutResPuts(STRING_CMD_HELP2); #ifdef FEATURE_ALIASES - ConOutResPuts(STRING_CMD_HELP3); + ConOutResPuts(STRING_CMD_HELP3); #endif #ifdef FEATURE_HISTORY - ConOutResPuts(STRING_CMD_HELP4); + ConOutResPuts(STRING_CMD_HELP4); #endif #ifdef FEATURE_UNIX_FILENAME_COMPLETION - ConOutResPuts(STRING_CMD_HELP5); + ConOutResPuts(STRING_CMD_HELP5); #endif #ifdef FEATURE_DIRECTORY_STACK - ConOutResPuts(STRING_CMD_HELP6); + ConOutResPuts(STRING_CMD_HELP6); #endif #ifdef FEATURE_REDIRECTION - ConOutResPuts(STRING_CMD_HELP7); + ConOutResPuts(STRING_CMD_HELP7); #endif - ConOutChar(_T('\n')); + ConOutChar(_T('\n')); } #endif static VOID ExecuteAutoRunFile(HKEY hkeyRoot) { - TCHAR autorun[2048]; - DWORD len = sizeof autorun; - HKEY hkey; + TCHAR autorun[2048]; + DWORD len = sizeof autorun; + HKEY hkey; if (RegOpenKeyEx(hkeyRoot, - _T("SOFTWARE\\Microsoft\\Command Processor"), - 0, - KEY_READ, - &hkey ) == ERROR_SUCCESS) - { - if(RegQueryValueEx(hkey, + _T("SOFTWARE\\Microsoft\\Command Processor"), + 0, + KEY_READ, + &hkey) == ERROR_SUCCESS) + { + if(RegQueryValueEx(hkey, _T("AutoRun"), 0, 0, (LPBYTE)autorun, &len) == ERROR_SUCCESS) - { - if (*autorun) - ParseCommandLine(autorun); - } - RegCloseKey(hkey); + { + if (*autorun) + ParseCommandLine(autorun); + } + RegCloseKey(hkey); } } @@ -1561,53 +1557,53 @@ static VOID GetCmdLineCommand(TCHAR *commandline, TCHAR *ptr, BOOL AlwaysStrip) { - TCHAR *LastQuote; - - while (_istspace(*ptr)) - ptr++; - - /* Remove leading quote, find final quote */ - if (*ptr == _T('"') && - (LastQuote = _tcsrchr(++ptr, _T('"'))) != NULL) - { - TCHAR *Space; - /* Under certain circumstances, all quotes are preserved. - * CMD /? documents these conditions as follows: - * 1. No /S switch - * 2. Exactly two quotes - * 3. No "special characters" between the quotes - * (CMD /? says &<>()@^| but parentheses did not - * trigger this rule when I tested them.) - * 4. Whitespace exists between the quotes - * 5. Enclosed string is an executable filename - */ - *LastQuote = _T('\0'); - for (Space = ptr + 1; Space < LastQuote; Space++) - { - if (_istspace(*Space)) /* Rule 4 */ - { - if (!AlwaysStrip && /* Rule 1 */ - !_tcspbrk(ptr, _T("\"&<>@^|")) && /* Rules 2, 3 */ - SearchForExecutable(ptr, commandline)) /* Rule 5 */ - { - /* All conditions met: preserve both the quotes */ - *LastQuote = _T('"'); - _tcscpy(commandline, ptr - 1); - return; - } - break; - } - } - - /* The conditions were not met: remove both the - * leading quote and the last quote */ - _tcscpy(commandline, ptr); - _tcscpy(&commandline[LastQuote - ptr], LastQuote + 1); - return; - } - - /* No quotes; just copy */ - _tcscpy(commandline, ptr); + TCHAR *LastQuote; + + while (_istspace(*ptr)) + ptr++; + + /* Remove leading quote, find final quote */ + if (*ptr == _T('"') && + (LastQuote = _tcsrchr(++ptr, _T('"'))) != NULL) + { + TCHAR *Space; + /* Under certain circumstances, all quotes are preserved. + * CMD /? documents these conditions as follows: + * 1. No /S switch + * 2. Exactly two quotes + * 3. No "special characters" between the quotes + * (CMD /? says &<>()@^| but parentheses did not + * trigger this rule when I tested them.) + * 4. Whitespace exists between the quotes + * 5. Enclosed string is an executable filename + */ + *LastQuote = _T('\0'); + for (Space = ptr + 1; Space < LastQuote; Space++) + { + if (_istspace(*Space)) /* Rule 4 */ + { + if (!AlwaysStrip && /* Rule 1 */ + !_tcspbrk(ptr, _T("\"&<>@^|")) && /* Rules 2, 3 */ + SearchForExecutable(ptr, commandline)) /* Rule 5 */ + { + /* All conditions met: preserve both the quotes */ + *LastQuote = _T('"'); + _tcscpy(commandline, ptr - 1); + return; + } + break; + } + } + + /* The conditions were not met: remove both the + * leading quote and the last quote */ + _tcscpy(commandline, ptr); + _tcscpy(&commandline[LastQuote - ptr], LastQuote + 1); + return; + } + + /* No quotes; just copy */ + _tcscpy(commandline, ptr); } /* @@ -1616,200 +1612,199 @@ static VOID Initialize() { - HMODULE NtDllModule; - TCHAR commandline[CMDLINE_LENGTH]; - TCHAR ModuleName[_MAX_PATH + 1]; - TCHAR lpBuffer[2]; - INT nExitCode; - - //INT len; - TCHAR *ptr, *cmdLine, option = 0; - BOOL AlwaysStrip = FALSE; - BOOL AutoRun = TRUE; - - /* get version information */ - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx (&osvi); - - /* Some people like to run ReactOS cmd.exe on Win98, it helps in the - * build process. So don't link implicitly against ntdll.dll, load it - * dynamically instead */ - NtDllModule = GetModuleHandle(TEXT("ntdll.dll")); - if (NtDllModule != NULL) - { - NtQueryInformationProcessPtr = (NtQueryInformationProcessProc)GetProcAddress(NtDllModule, "NtQueryInformationProcess"); - NtReadVirtualMemoryPtr = (NtReadVirtualMemoryProc)GetProcAddress(NtDllModule, "NtReadVirtualMemory"); - } - - InitLocale (); - - /* get default input and output console handles */ - hOut = GetStdHandle (STD_OUTPUT_HANDLE); - hIn = GetStdHandle (STD_INPUT_HANDLE); - - /* Set EnvironmentVariable PROMPT if it does not exists any env value. - for you can change the EnvirommentVariable for prompt before cmd start - this patch are not 100% right, if it does not exists a PROMPT value cmd should use - $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ - if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, sizeof(lpBuffer) / sizeof(lpBuffer[0])) == 0) - SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); + HMODULE NtDllModule; + TCHAR commandline[CMDLINE_LENGTH]; + TCHAR ModuleName[_MAX_PATH + 1]; + TCHAR lpBuffer[2]; + INT nExitCode; + + //INT len; + TCHAR *ptr, *cmdLine, option = 0; + BOOL AlwaysStrip = FALSE; + BOOL AutoRun = TRUE; + + /* get version information */ + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx (&osvi); + + /* Some people like to run ReactOS cmd.exe on Win98, it helps in the + * build process. So don't link implicitly against ntdll.dll, load it + * dynamically instead */ + NtDllModule = GetModuleHandle(TEXT("ntdll.dll")); + if (NtDllModule != NULL) + { + NtQueryInformationProcessPtr = (NtQueryInformationProcessProc)GetProcAddress(NtDllModule, "NtQueryInformationProcess"); + NtReadVirtualMemoryPtr = (NtReadVirtualMemoryProc)GetProcAddress(NtDllModule, "NtReadVirtualMemory"); + } + + InitLocale (); + + /* get default input and output console handles */ + hOut = GetStdHandle (STD_OUTPUT_HANDLE); + hIn = GetStdHandle (STD_INPUT_HANDLE); + + /* Set EnvironmentVariable PROMPT if it does not exists any env value. + for you can change the EnvirommentVariable for prompt before cmd start + this patch are not 100% right, if it does not exists a PROMPT value cmd should use + $P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */ + if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, sizeof(lpBuffer) / sizeof(lpBuffer[0])) == 0) + SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); #ifdef FEATURE_DIR_STACK - /* initialize directory stack */ - InitDirectoryStack (); + /* initialize directory stack */ + InitDirectoryStack (); #endif #ifdef FEATURE_HISTORY - /*initialize history*/ - InitHistory(); + /*initialize history*/ + InitHistory(); #endif - /* Set COMSPEC environment variable */ - if (0 != GetModuleFileName (NULL, ModuleName, _MAX_PATH + 1)) - { - ModuleName[_MAX_PATH] = _T('\0'); - SetEnvironmentVariable (_T("COMSPEC"), ModuleName); - } - - /* add ctrl break handler */ - AddBreakHandler (); - - - SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); - - cmdLine = GetCommandLine(); - TRACE ("[command args: %s]\n", debugstr_aw(cmdLine)); - - for (ptr = cmdLine; *ptr; ptr++) - { - if (*ptr == _T('/')) - { - option = _totupper(ptr[1]); - if (option == _T('?')) - { - ConOutResPaging(TRUE,STRING_CMD_HELP8); - nErrorLevel = 1; - bExit = TRUE; - return; - } - else if (option == _T('P')) - { - if (!IsExistingFile (_T("\\autoexec.bat"))) - { + /* Set COMSPEC environment variable */ + if (0 != GetModuleFileName (NULL, ModuleName, _MAX_PATH + 1)) + { + ModuleName[_MAX_PATH] = _T('\0'); + SetEnvironmentVariable (_T("COMSPEC"), ModuleName); + } + + /* add ctrl break handler */ + AddBreakHandler (); + + SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); + + cmdLine = GetCommandLine(); + TRACE ("[command args: %s]\n", debugstr_aw(cmdLine)); + + for (ptr = cmdLine; *ptr; ptr++) + { + if (*ptr == _T('/')) + { + option = _totupper(ptr[1]); + if (option == _T('?')) + { + ConOutResPaging(TRUE,STRING_CMD_HELP8); + nErrorLevel = 1; + bExit = TRUE; + return; + } + else if (option == _T('P')) + { + if (!IsExistingFile (_T("\\autoexec.bat"))) + { #ifdef INCLUDE_CMD_DATE - cmd_date (_T("")); + cmd_date (_T("")); #endif #ifdef INCLUDE_CMD_TIME - cmd_time (_T("")); + cmd_time (_T("")); #endif - } - else - { - ParseCommandLine (_T("\\autoexec.bat")); - } - bCanExit = FALSE; - } - else if (option == _T('A')) - { - bUnicodeOutput = FALSE; - } - else if (option == _T('C') || option == _T('K') || option == _T('R')) - { - /* Remainder of command line is a command to be run */ - break; - } - else if (option == _T('D')) - { - AutoRun = FALSE; - } - else if (option == _T('Q')) - { - bDisableBatchEcho = TRUE; - } - else if (option == _T('S')) - { - AlwaysStrip = TRUE; - } + } + else + { + ParseCommandLine (_T("\\autoexec.bat")); + } + bCanExit = FALSE; + } + else if (option == _T('A')) + { + bUnicodeOutput = FALSE; + } + else if (option == _T('C') || option == _T('K') || option == _T('R')) + { + /* Remainder of command line is a command to be run */ + break; + } + else if (option == _T('D')) + { + AutoRun = FALSE; + } + else if (option == _T('Q')) + { + bDisableBatchEcho = TRUE; + } + else if (option == _T('S')) + { + AlwaysStrip = TRUE; + } #ifdef INCLUDE_CMD_COLOR - else if (!_tcsnicmp(ptr, _T("/T:"), 3)) - { - /* process /T (color) argument */ - wDefColor = (WORD)_tcstoul(&ptr[3], &ptr, 16); - SetScreenColor(wDefColor, FALSE); - } + else if (!_tcsnicmp(ptr, _T("/T:"), 3)) + { + /* process /T (color) argument */ + wDefColor = (WORD)_tcstoul(&ptr[3], &ptr, 16); + SetScreenColor(wDefColor, FALSE); + } #endif - else if (option == _T('U')) - { - bUnicodeOutput = TRUE; - } - else if (option == _T('V')) - { - bDelayedExpansion = _tcsnicmp(&ptr[2], _T(":OFF"), 4); - } - } - } - - if (!*ptr) - { - /* If neither /C or /K was given, display a simple version string */ - ConOutResPrintf(STRING_REACTOS_VERSION, - _T(KERNEL_RELEASE_STR), - _T(KERNEL_VERSION_BUILD_STR)); - ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); - } - - if (AutoRun) - { - ExecuteAutoRunFile(HKEY_LOCAL_MACHINE); - ExecuteAutoRunFile(HKEY_CURRENT_USER); - } - - if (*ptr) - { - /* Do the /C or /K command */ - GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); - nExitCode = ParseCommandLine(commandline); - if (option != _T('K')) - { - nErrorLevel = nExitCode; - bExit = TRUE; - } - } + else if (option == _T('U')) + { + bUnicodeOutput = TRUE; + } + else if (option == _T('V')) + { + bDelayedExpansion = _tcsnicmp(&ptr[2], _T(":OFF"), 4); + } + } + } + + if (!*ptr) + { + /* If neither /C or /K was given, display a simple version string */ + ConOutResPrintf(STRING_REACTOS_VERSION, + _T(KERNEL_RELEASE_STR), + _T(KERNEL_VERSION_BUILD_STR)); + ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); + } + + if (AutoRun) + { + ExecuteAutoRunFile(HKEY_LOCAL_MACHINE); + ExecuteAutoRunFile(HKEY_CURRENT_USER); + } + + if (*ptr) + { + /* Do the /C or /K command */ + GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); + nExitCode = ParseCommandLine(commandline); + if (option != _T('K')) + { + nErrorLevel = nExitCode; + bExit = TRUE; + } + } } static VOID Cleanup() { - /* run cmdexit.bat */ - if (IsExistingFile (_T("cmdexit.bat"))) - { - ConErrResPuts(STRING_CMD_ERROR5); - - ParseCommandLine (_T("cmdexit.bat")); - } - else if (IsExistingFile (_T("\\cmdexit.bat"))) - { - ConErrResPuts (STRING_CMD_ERROR5); - ParseCommandLine (_T("\\cmdexit.bat")); - } + /* run cmdexit.bat */ + if (IsExistingFile (_T("cmdexit.bat"))) + { + ConErrResPuts(STRING_CMD_ERROR5); + + ParseCommandLine (_T("cmdexit.bat")); + } + else if (IsExistingFile (_T("\\cmdexit.bat"))) + { + ConErrResPuts (STRING_CMD_ERROR5); + ParseCommandLine (_T("\\cmdexit.bat")); + } #ifdef FEATURE_DIECTORY_STACK - /* destroy directory stack */ - DestroyDirectoryStack (); + /* destroy directory stack */ + DestroyDirectoryStack (); #endif #ifdef FEATURE_HISTORY - CleanHistory(); + CleanHistory(); #endif - /* free GetEnvVar's buffer */ - GetEnvVar(NULL); - - /* remove ctrl break handler */ - RemoveBreakHandler (); - SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ), - ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); - DeleteCriticalSection(&ChildProcessRunningLock); + /* free GetEnvVar's buffer */ + GetEnvVar(NULL); + + /* remove ctrl break handler */ + RemoveBreakHandler (); + SetConsoleMode(GetStdHandle( STD_INPUT_HANDLE ), + ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT); + DeleteCriticalSection(&ChildProcessRunningLock); } /* @@ -1817,51 +1812,51 @@ */ int _tmain(int argc, const TCHAR *argv[]) { - HANDLE hConsole; - TCHAR startPath[MAX_PATH]; - CONSOLE_SCREEN_BUFFER_INFO Info; - - InitializeCriticalSection(&ChildProcessRunningLock); - lpOriginalEnvironment = DuplicateEnvironment(); - - GetCurrentDirectory(MAX_PATH,startPath); - _tchdir(startPath); - - SetFileApisToOEM(); - InputCodePage = 0; - OutputCodePage = 0; - - hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, NULL); - if (hConsole != INVALID_HANDLE_VALUE) - { - if (!GetConsoleScreenBufferInfo(hConsole, &Info)) - { - ConErrFormatMessage(GetLastError()); - return(1); - } - wDefColor = Info.wAttributes; - CloseHandle(hConsole); - } - - InputCodePage = GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - CMD_ModuleHandle = GetModuleHandle(NULL); - - /* check switches on command-line */ - Initialize(); - - /* call prompt routine */ - ProcessInput(); - - /* do the cleanup */ - Cleanup(); - - cmd_free(lpOriginalEnvironment); - - cmd_exit(nErrorLevel); - return(nErrorLevel); + HANDLE hConsole; + TCHAR startPath[MAX_PATH]; + CONSOLE_SCREEN_BUFFER_INFO Info; + + InitializeCriticalSection(&ChildProcessRunningLock); + lpOriginalEnvironment = DuplicateEnvironment(); + + GetCurrentDirectory(MAX_PATH,startPath); + _tchdir(startPath); + + SetFileApisToOEM(); + InputCodePage = 0; + OutputCodePage = 0; + + hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + if (hConsole != INVALID_HANDLE_VALUE) + { + if (!GetConsoleScreenBufferInfo(hConsole, &Info)) + { + ConErrFormatMessage(GetLastError()); + return(1); + } + wDefColor = Info.wAttributes; + CloseHandle(hConsole); + } + + InputCodePage = GetConsoleCP(); + OutputCodePage = GetConsoleOutputCP(); + CMD_ModuleHandle = GetModuleHandle(NULL); + + /* check switches on command-line */ + Initialize(); + + /* call prompt routine */ + ProcessInput(); + + /* do the cleanup */ + Cleanup(); + + cmd_free(lpOriginalEnvironment); + + cmd_exit(nErrorLevel); + return(nErrorLevel); } /* EOF */

11 years, 5 months

[ekohl] 59388: [NETAPI32] Implement NetUserChangePassword.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 30 13:02:45 2013 New Revision: 59388 URL: http://svn.reactos.org/svn/reactos?rev=59388&view=rev Log: [NETAPI32] Implement NetUserChangePassword. Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sun Jun 30 13:02:45 2013 @@ -31,7 +31,7 @@ add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(netapi32 samlib) +add_delay_importlibs(netapi32 samlib secur32) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Sun Jun 30 13:02:45 2013 @@ -25,6 +25,7 @@ #define NTOS_MODE_USER #include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <ntsam.h> Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Jun 30 13:02:45 2013 @@ -20,7 +20,6 @@ /* * TODO: - * Implement NetUserChangePassword * Implement NetUserGetGroups * Implement NetUserSetGroups * NetUserGetLocalGroups does not support LG_INCLUDE_INDIRECT yet. @@ -2100,8 +2099,137 @@ LPCWSTR oldpassword, LPCWSTR newpassword) { + PMSV1_0_CHANGEPASSWORD_REQUEST RequestBuffer = NULL; + PMSV1_0_CHANGEPASSWORD_RESPONSE ResponseBuffer = NULL; + ULONG RequestBufferSize; + ULONG ResponseBufferSize = 0; + LPWSTR Ptr; + ANSI_STRING PackageName; + ULONG AuthenticationPackage = 0; + HANDLE LsaHandle = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS ProtocolStatus; + TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); - return NERR_Success; + + /* FIXME: handle null domain or user name */ + + /* Check the parameters */ + if ((oldpassword == NULL) || + (newpassword == NULL)) + return ERROR_INVALID_PARAMETER; + + /* Connect to the LSA server */ + Status = LsaConnectUntrusted(&LsaHandle); + if (!NT_SUCCESS(Status)) + return NetpNtStatusToApiStatus(Status); + + /* Get the authentication package ID */ + RtlInitAnsiString(&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Calculate the request buffer size */ + RequestBufferSize = sizeof(MSV1_0_CHANGEPASSWORD_REQUEST) + + ((wcslen(domainname) + 1) * sizeof(WCHAR)) + + ((wcslen(username) + 1) * sizeof(WCHAR)) + + ((wcslen(oldpassword) + 1) * sizeof(WCHAR)) + + ((wcslen(newpassword) + 1) * sizeof(WCHAR)); + + /* Allocate the request buffer */ + ApiStatus = NetApiBufferAllocate(RequestBufferSize, + (PVOID*)&RequestBuffer); + if (ApiStatus != NERR_Success) + goto done; + + /* Initialize the request buffer */ + RequestBuffer->MessageType = MsV1_0ChangePassword; + RequestBuffer->Impersonating = TRUE; + + Ptr = (LPWSTR)((ULONG_PTR)RequestBuffer + sizeof(MSV1_0_CHANGEPASSWORD_REQUEST)); + + /* Pack the domain name */ + RequestBuffer->DomainName.Length = wcslen(domainname) * sizeof(WCHAR); + RequestBuffer->DomainName.MaximumLength = RequestBuffer->DomainName.Length + sizeof(WCHAR); + RequestBuffer->DomainName.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->DomainName.Buffer, + domainname, + RequestBuffer->DomainName.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->DomainName.MaximumLength); + + /* Pack the user name */ + RequestBuffer->AccountName.Length = wcslen(username) * sizeof(WCHAR); + RequestBuffer->AccountName.MaximumLength = RequestBuffer->AccountName.Length + sizeof(WCHAR); + RequestBuffer->AccountName.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->AccountName.Buffer, + username, + RequestBuffer->AccountName.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->AccountName.MaximumLength); + + /* Pack the old password */ + RequestBuffer->OldPassword.Length = wcslen(oldpassword) * sizeof(WCHAR); + RequestBuffer->OldPassword.MaximumLength = RequestBuffer->OldPassword.Length + sizeof(WCHAR); + RequestBuffer->OldPassword.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->OldPassword.Buffer, + oldpassword, + RequestBuffer->OldPassword.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->OldPassword.MaximumLength); + + /* Pack the new password */ + RequestBuffer->NewPassword.Length = wcslen(newpassword) * sizeof(WCHAR); + RequestBuffer->NewPassword.MaximumLength = RequestBuffer->NewPassword.Length + sizeof(WCHAR); + RequestBuffer->NewPassword.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->NewPassword.Buffer, + newpassword, + RequestBuffer->NewPassword.MaximumLength); + + /* Call the authentication package */ + Status = LsaCallAuthenticationPackage(LsaHandle, + AuthenticationPackage, + RequestBuffer, + RequestBufferSize, + (PVOID*)&ResponseBuffer, + &ResponseBufferSize, + &ProtocolStatus); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + if (!NT_SUCCESS(ProtocolStatus)) + { + ApiStatus = NetpNtStatusToApiStatus(ProtocolStatus); + goto done; + } + +done: + if (RequestBuffer != NULL) + NetApiBufferFree(RequestBuffer); + + if (ResponseBuffer != NULL) + LsaFreeReturnBuffer(ResponseBuffer); + + if (LsaHandle != NULL) + NtClose(LsaHandle); + + return ApiStatus; }

11 years, 5 months

[hbelusca] 59387: [CMD] Fix whitespace (part 5ter/6) (convert tabs into 4-space indent).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 30 12:58:45 2013 New Revision: 59387 URL: http://svn.reactos.org/svn/reactos?rev=59387&view=rev Log: [CMD] Fix whitespace (part 5ter/6) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sun Jun 30 12:58:45 2013 @@ -114,501 +114,491 @@ static VOID ClearCommandLine (LPTSTR str, INT maxlen, SHORT orgx, SHORT orgy) { - INT count; - - SetCursorXY (orgx, orgy); - for (count = 0; count < (INT)_tcslen (str); count++) - ConOutChar (_T(' ')); - _tcsnset (str, _T('\0'), maxlen); - SetCursorXY (orgx, orgy); + INT count; + + SetCursorXY (orgx, orgy); + for (count = 0; count < (INT)_tcslen (str); count++) + ConOutChar (_T(' ')); + _tcsnset (str, _T('\0'), maxlen); + SetCursorXY (orgx, orgy); } /* read in a command line */ BOOL ReadCommand (LPTSTR str, INT maxlen) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - SHORT orgx; /* origin x/y */ - SHORT orgy; - SHORT curx; /*current x/y cursor position*/ - SHORT cury; - SHORT tempscreen; - INT count; /*used in some for loops*/ - INT current = 0; /*the position of the cursor in the string (str)*/ - INT charcount = 0;/*chars in the string (str)*/ - INPUT_RECORD ir; + CONSOLE_SCREEN_BUFFER_INFO csbi; + SHORT orgx; /* origin x/y */ + SHORT orgy; + SHORT curx; /*current x/y cursor position*/ + SHORT cury; + SHORT tempscreen; + INT count; /*used in some for loops*/ + INT current = 0; /*the position of the cursor in the string (str)*/ + INT charcount = 0;/*chars in the string (str)*/ + INPUT_RECORD ir; #ifdef FEATURE_UNIX_FILENAME_COMPLETION - WORD wLastKey = 0; -#endif - TCHAR ch; - BOOL bReturn = FALSE; - BOOL bCharInput; + WORD wLastKey = 0; +#endif + TCHAR ch; + BOOL bReturn = FALSE; + BOOL bCharInput; #ifdef FEATURE_4NT_FILENAME_COMPLETION - TCHAR szPath[MAX_PATH]; + TCHAR szPath[MAX_PATH]; #endif #ifdef FEATURE_HISTORY - //BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ - TCHAR PreviousChar; -#endif - - if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) - { - /* No console */ - HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE); - DWORD dwRead; - CHAR chr; - do - { - if (!ReadFile(hStdin, &chr, 1, &dwRead, NULL) || !dwRead) - return FALSE; + //BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ + TCHAR PreviousChar; +#endif + + if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { + /* No console */ + HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE); + DWORD dwRead; + CHAR chr; + do + { + if (!ReadFile(hStdin, &chr, 1, &dwRead, NULL) || !dwRead) + return FALSE; #ifdef _UNICODE - MultiByteToWideChar(InputCodePage, 0, &chr, 1, &str[charcount++], 1); -#endif - } while (chr != '\n' && charcount < maxlen); - str[charcount] = _T('\0'); - return TRUE; - } - - /* get screen size */ - maxx = csbi.dwSize.X; - maxy = csbi.dwSize.Y; - - curx = orgx = csbi.dwCursorPosition.X; - cury = orgy = csbi.dwCursorPosition.Y; - - memset (str, 0, maxlen * sizeof (TCHAR)); - - SetCursorType (bInsert, TRUE); - - do - { - - bReturn = FALSE; - - ConInKey (&ir); - - if (ir.Event.KeyEvent.dwControlKeyState & - (RIGHT_ALT_PRESSED|LEFT_ALT_PRESSED| - RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) - { - - switch (ir.Event.KeyEvent.wVirtualKeyCode) - { - + MultiByteToWideChar(InputCodePage, 0, &chr, 1, &str[charcount++], 1); +#endif + } while (chr != '\n' && charcount < maxlen); + str[charcount] = _T('\0'); + return TRUE; + } + + /* get screen size */ + maxx = csbi.dwSize.X; + maxy = csbi.dwSize.Y; + + curx = orgx = csbi.dwCursorPosition.X; + cury = orgy = csbi.dwCursorPosition.Y; + + memset (str, 0, maxlen * sizeof (TCHAR)); + + SetCursorType (bInsert, TRUE); + + do + { + + bReturn = FALSE; + + ConInKey (&ir); + + if (ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_ALT_PRESSED |LEFT_ALT_PRESSED| + RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) + { + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { #ifdef FEATURE_HISTORY - - case 'K': - /*add the current command line to the history*/ - if (ir.Event.KeyEvent.dwControlKeyState & - (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) - { - - if (str[0]) - History(0,str); - - ClearCommandLine (str, maxlen, orgx, orgy); - current = charcount = 0; - curx = orgx; - cury = orgy; - //bContinue=TRUE; - break; - } - - case 'D': - /*delete current history entry*/ - if (ir.Event.KeyEvent.dwControlKeyState & - (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) - { - ClearCommandLine (str, maxlen, orgx, orgy); - History_del_current_entry(str); - current = charcount = _tcslen (str); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); - //bContinue=TRUE; - break; - } - -#endif/*FEATURE_HISTORY*/ - } - - - - - } - - bCharInput = FALSE; - - switch (ir.Event.KeyEvent.wVirtualKeyCode) - { - case VK_BACK: - /* <BACKSPACE> - delete character to left of cursor */ - if (current > 0 && charcount > 0) - { - if (current == charcount) - { - /* if at end of line */ - str[current - 1] = _T('\0'); - if (GetCursorX () != 0) - { - ConOutPrintf (_T("\b \b")); - curx--; - } - else - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - ConOutChar (_T(' ')); - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - cury--; - curx = maxx - 1; - } - } - else - { - for (count = current - 1; count < charcount; count++) - str[count] = str[count + 1]; - if (GetCursorX () != 0) - { - SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); - curx--; - } - else - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - cury--; - curx = maxx - 1; - } - GetCursorXY (&curx, &cury); - ConOutPrintf (_T("%s "), &str[current - 1]); - SetCursorXY (curx, cury); - } - charcount--; - current--; - } - break; - - case VK_INSERT: - /* toggle insert/overstrike mode */ - bInsert ^= TRUE; - SetCursorType (bInsert, TRUE); - break; - - case VK_DELETE: - /* delete character under cursor */ - if (current != charcount && charcount > 0) - { - for (count = current; count < charcount; count++) - str[count] = str[count + 1]; - charcount--; - GetCursorXY (&curx, &cury); - ConOutPrintf (_T("%s "), &str[current]); - SetCursorXY (curx, cury); - } - break; - - case VK_HOME: - /* goto beginning of string */ - if (current != 0) - { - SetCursorXY (orgx, orgy); - curx = orgx; - cury = orgy; - current = 0; - } - break; - - case VK_END: - /* goto end of string */ - if (current != charcount) - { - SetCursorXY (orgx, orgy); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); - current = charcount; - } - break; - - case VK_TAB: + case 'K': + /*add the current command line to the history*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + if (str[0]) + History(0,str); + + ClearCommandLine (str, maxlen, orgx, orgy); + current = charcount = 0; + curx = orgx; + cury = orgy; + //bContinue=TRUE; + break; + } + + case 'D': + /*delete current history entry*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + ClearCommandLine (str, maxlen, orgx, orgy); + History_del_current_entry(str); + current = charcount = _tcslen (str); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); + //bContinue=TRUE; + break; + } + +#endif /*FEATURE_HISTORY*/ + } + } + + bCharInput = FALSE; + + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { + case VK_BACK: + /* <BACKSPACE> - delete character to left of cursor */ + if (current > 0 && charcount > 0) + { + if (current == charcount) + { + /* if at end of line */ + str[current - 1] = _T('\0'); + if (GetCursorX () != 0) + { + ConOutPrintf (_T("\b \b")); + curx--; + } + else + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + ConOutChar (_T(' ')); + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + cury--; + curx = maxx - 1; + } + } + else + { + for (count = current - 1; count < charcount; count++) + str[count] = str[count + 1]; + if (GetCursorX () != 0) + { + SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); + curx--; + } + else + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + cury--; + curx = maxx - 1; + } + GetCursorXY (&curx, &cury); + ConOutPrintf (_T("%s "), &str[current - 1]); + SetCursorXY (curx, cury); + } + charcount--; + current--; + } + break; + + case VK_INSERT: + /* toggle insert/overstrike mode */ + bInsert ^= TRUE; + SetCursorType (bInsert, TRUE); + break; + + case VK_DELETE: + /* delete character under cursor */ + if (current != charcount && charcount > 0) + { + for (count = current; count < charcount; count++) + str[count] = str[count + 1]; + charcount--; + GetCursorXY (&curx, &cury); + ConOutPrintf (_T("%s "), &str[current]); + SetCursorXY (curx, cury); + } + break; + + case VK_HOME: + /* goto beginning of string */ + if (current != 0) + { + SetCursorXY (orgx, orgy); + curx = orgx; + cury = orgy; + current = 0; + } + break; + + case VK_END: + /* goto end of string */ + if (current != charcount) + { + SetCursorXY (orgx, orgy); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); + current = charcount; + } + break; + + case VK_TAB: #ifdef FEATURE_UNIX_FILENAME_COMPLETION - /* expand current file name */ - if ((current == charcount) || - (current == charcount - 1 && - str[current] == _T('"'))) /* only works at end of line*/ - { - if (wLastKey != VK_TAB) - { - /* if first TAB, complete filename*/ - tempscreen = charcount; - CompleteFilename (str, charcount); - charcount = _tcslen (str); - current = charcount; - - SetCursorXY (orgx, orgy); - ConOutPrintf (_T("%s"), str); - - if (tempscreen > charcount) - { - GetCursorXY (&curx, &cury); - for (count = tempscreen - charcount; count--; ) - ConOutChar (_T(' ')); - SetCursorXY (curx, cury); - } - else - { - if (((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - } - - /* set cursor position */ - SetCursorXY ((orgx + current) % maxx, - orgy + (orgx + current) / maxx); - GetCursorXY (&curx, &cury); - } - else - { - /*if second TAB, list matches*/ - if (ShowCompletionMatches (str, charcount)) - { - PrintPrompt (); - GetCursorXY (&orgx, &orgy); - ConOutPrintf (_T("%s"), str); - - /* set cursor position */ - SetCursorXY ((orgx + current) % maxx, - orgy + (orgx + current) / maxx); - GetCursorXY (&curx, &cury); - } - - } - } - else - { - MessageBeep (-1); - } + /* expand current file name */ + if ((current == charcount) || + (current == charcount - 1 && + str[current] == _T('"'))) /* only works at end of line*/ + { + if (wLastKey != VK_TAB) + { + /* if first TAB, complete filename*/ + tempscreen = charcount; + CompleteFilename (str, charcount); + charcount = _tcslen (str); + current = charcount; + + SetCursorXY (orgx, orgy); + ConOutPrintf (_T("%s"), str); + + if (tempscreen > charcount) + { + GetCursorXY (&curx, &cury); + for (count = tempscreen - charcount; count--; ) + ConOutChar (_T(' ')); + SetCursorXY (curx, cury); + } + else + { + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + } + + /* set cursor position */ + SetCursorXY ((orgx + current) % maxx, + orgy + (orgx + current) / maxx); + GetCursorXY (&curx, &cury); + } + else + { + /*if second TAB, list matches*/ + if (ShowCompletionMatches (str, charcount)) + { + PrintPrompt (); + GetCursorXY (&orgx, &orgy); + ConOutPrintf (_T("%s"), str); + + /* set cursor position */ + SetCursorXY ((orgx + current) % maxx, + orgy + (orgx + current) / maxx); + GetCursorXY (&curx, &cury); + } + + } + } + else + { + MessageBeep (-1); + } #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION - - /* used to later see if we went down to the next line */ - tempscreen = charcount; - szPath[0]=_T('\0'); - - /* str is the whole things that is on the current line - that is and and out. arg 2 is weather it goes back - one file or forward one file */ - CompleteFilename(str, !(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED), szPath, current); - /* Attempt to clear the line */ - ClearCommandLine (str, maxlen, orgx, orgy); - curx = orgx; - cury = orgy; - current = charcount = 0; - - /* Everything is deleted, lets add it back in */ - _tcscpy(str,szPath); - - /* Figure out where cusor is going to be after we print it */ - charcount = _tcslen (str); - current = charcount; - - SetCursorXY (orgx, orgy); - /* Print out what we have now */ - ConOutPrintf (_T("%s"), str); - - /* Move cursor accordingly */ - if(tempscreen > charcount) - { - GetCursorXY (&curx, &cury); - for(count = tempscreen - charcount; count--; ) - ConOutChar (_T(' ')); - SetCursorXY (curx, cury); - } - else - { - if(((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - } - SetCursorXY((short)(((int)orgx + current) % maxx), (short)((int)orgy + ((int)orgx + current) / maxx)); - GetCursorXY(&curx, &cury); - -#endif - break; - - case _T('M'): - case _T('C'): - /* ^M does the same as return */ - bCharInput = TRUE; - if(!(ir.Event.KeyEvent.dwControlKeyState & - (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) - { - break; - } - - case VK_RETURN: - /* end input, return to main */ + /* used to later see if we went down to the next line */ + tempscreen = charcount; + szPath[0]=_T('\0'); + + /* str is the whole things that is on the current line + that is and and out. arg 2 is weather it goes back + one file or forward one file */ + CompleteFilename(str, !(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED), szPath, current); + /* Attempt to clear the line */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + + /* Everything is deleted, lets add it back in */ + _tcscpy(str,szPath); + + /* Figure out where cusor is going to be after we print it */ + charcount = _tcslen (str); + current = charcount; + + SetCursorXY (orgx, orgy); + /* Print out what we have now */ + ConOutPrintf (_T("%s"), str); + + /* Move cursor accordingly */ + if(tempscreen > charcount) + { + GetCursorXY (&curx, &cury); + for(count = tempscreen - charcount; count--; ) + ConOutChar (_T(' ')); + SetCursorXY (curx, cury); + } + else + { + if(((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + } + SetCursorXY((short)(((int)orgx + current) % maxx), (short)((int)orgy + ((int)orgx + current) / maxx)); + GetCursorXY(&curx, &cury); +#endif + break; + + case _T('M'): + case _T('C'): + /* ^M does the same as return */ + bCharInput = TRUE; + if(!(ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + { + break; + } + + case VK_RETURN: + /* end input, return to main */ #ifdef FEATURE_HISTORY - /* add to the history */ - if (str[0]) - History (0, str); -#endif - str[charcount++] = _T('\n'); - str[charcount] = _T('\0'); - ConOutChar (_T('\n')); - bReturn = TRUE; - break; - - case VK_ESCAPE: - /* clear str Make this callable! */ - ClearCommandLine (str, maxlen, orgx, orgy); - curx = orgx; - cury = orgy; - current = charcount = 0; - break; + /* add to the history */ + if (str[0]) + History (0, str); +#endif + str[charcount++] = _T('\n'); + str[charcount] = _T('\0'); + ConOutChar (_T('\n')); + bReturn = TRUE; + break; + + case VK_ESCAPE: + /* clear str Make this callable! */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + break; #ifdef FEATURE_HISTORY - case VK_F3: - History_move_to_bottom(); -#endif - case VK_UP: + case VK_F3: + History_move_to_bottom(); +#endif + case VK_UP: #ifdef FEATURE_HISTORY - /* get previous command from buffer */ - ClearCommandLine (str, maxlen, orgx, orgy); - History (-1, str); - current = charcount = _tcslen (str); - if (((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); -#endif - break; - - case VK_DOWN: + /* get previous command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (-1, str); + current = charcount = _tcslen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); +#endif + break; + + case VK_DOWN: #ifdef FEATURE_HISTORY - /* get next command from buffer */ - ClearCommandLine (str, maxlen, orgx, orgy); - History (1, str); - current = charcount = _tcslen (str); - if (((charcount + orgx) / maxx) + orgy > maxy - 1) - orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); - ConOutPrintf (_T("%s"), str); - GetCursorXY (&curx, &cury); -#endif - break; - - case VK_LEFT: - /* move cursor left */ - if (current > 0) - { - current--; - if (GetCursorX () == 0) - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - curx = maxx - 1; - cury--; - } - else - { - SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); - curx--; - } - } - else - { - MessageBeep (-1); - } - break; - - case VK_RIGHT: - /* move cursor right */ - if (current != charcount) - { - current++; - if (GetCursorX () == maxx - 1) - { - SetCursorXY (0, (SHORT)(GetCursorY () + 1)); - curx = 0; - cury++; - } - else - { - SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); - curx++; - } - } + /* get next command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (1, str); + current = charcount = _tcslen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + ConOutPrintf (_T("%s"), str); + GetCursorXY (&curx, &cury); +#endif + break; + + case VK_LEFT: + /* move cursor left */ + if (current > 0) + { + current--; + if (GetCursorX () == 0) + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + curx = maxx - 1; + cury--; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); + curx--; + } + } + else + { + MessageBeep (-1); + } + break; + + case VK_RIGHT: + /* move cursor right */ + if (current != charcount) + { + current++; + if (GetCursorX () == maxx - 1) + { + SetCursorXY (0, (SHORT)(GetCursorY () + 1)); + curx = 0; + cury++; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); + curx++; + } + } #ifdef FEATURE_HISTORY - else - { - LPCTSTR last = PeekHistory(-1); - if (last && charcount < (INT)_tcslen (last)) - { - PreviousChar = last[current]; - ConOutChar(PreviousChar); - GetCursorXY(&curx, &cury); - str[current++] = PreviousChar; - charcount++; - } - } -#endif - break; - - default: - /* This input is just a normal char */ - bCharInput = TRUE; - - } + else + { + LPCTSTR last = PeekHistory(-1); + if (last && charcount < (INT)_tcslen (last)) + { + PreviousChar = last[current]; + ConOutChar(PreviousChar); + GetCursorXY(&curx, &cury); + str[current++] = PreviousChar; + charcount++; + } + } +#endif + break; + + default: + /* This input is just a normal char */ + bCharInput = TRUE; + + } #ifdef _UNICODE - ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + ch = ir.Event.KeyEvent.uChar.UnicodeChar; + if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) #endif /* _UNICODE */ - { - /* insert character into string... */ - if (bInsert && current != charcount) - { - /* If this character insertion will cause screen scrolling, - * adjust the saved origin of the command prompt. */ - tempscreen = _tcslen(str + current) + curx; - if ((tempscreen % maxx) == (maxx - 1) && - (tempscreen / maxx) + cury == (maxy - 1)) - { - orgy--; - cury--; - } - - for (count = charcount; count > current; count--) - str[count] = str[count - 1]; - str[current++] = ch; - if (curx == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutPrintf (_T("%s"), &str[current - 1]); - SetCursorXY (curx, cury); - charcount++; - } - else - { - if (current == charcount) - charcount++; - str[current++] = ch; - if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) - orgy--, cury--; - if (GetCursorX () == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutChar (ch); - } - } - - //wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; - } - while (!bReturn); - - SetCursorType (bInsert, TRUE); + { + /* insert character into string... */ + if (bInsert && current != charcount) + { + /* If this character insertion will cause screen scrolling, + * adjust the saved origin of the command prompt. */ + tempscreen = _tcslen(str + current) + curx; + if ((tempscreen % maxx) == (maxx - 1) && + (tempscreen / maxx) + cury == (maxy - 1)) + { + orgy--; + cury--; + } + + for (count = charcount; count > current; count--) + str[count] = str[count - 1]; + str[current++] = ch; + if (curx == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutPrintf (_T("%s"), &str[current - 1]); + SetCursorXY (curx, cury); + charcount++; + } + else + { + if (current == charcount) + charcount++; + str[current++] = ch; + if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) + orgy--, cury--; + if (GetCursorX () == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutChar (ch); + } + } + + //wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; + } + while (!bReturn); + + SetCursorType (bInsert, TRUE); #ifdef FEATURE_ALIASES - /* expand all aliases */ - ExpandAlias (str, maxlen); + /* expand all aliases */ + ExpandAlias (str, maxlen); #endif /* FEATURE_ALIAS */ - return TRUE; + return TRUE; }

11 years, 5 months

[hbelusca] 59386: [CMD] Fix whitespace (part 5bis/6) (convert tabs into 4-space indent).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 30 12:52:54 2013 New Revision: 59386 URL: http://svn.reactos.org/svn/reactos?rev=59386&view=rev Log: [CMD] Fix whitespace (part 5bis/6) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/del.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Sun Jun 30 12:52:54 2013 @@ -54,8 +54,8 @@ * 23-Feb-2001 (Carl Nettelblad <cnettel(a)hem.passagen.es>) * Fixes made to get "for" working. * - * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) - * Remove all hardcode string to En.rc + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) + * Remove all hardcoded strings in En.rc */ #include "precomp.h" @@ -65,7 +65,7 @@ */ LPBATCH_CONTEXT bc = NULL; -BOOL bEcho = TRUE; /* The echo flag */ +BOOL bEcho = TRUE; /* The echo flag */ @@ -82,24 +82,24 @@ LPTSTR FindArg(TCHAR Char, BOOL *IsParam0) { - LPTSTR pp; - INT n = Char - _T('0'); - - TRACE ("FindArg: (%d)\n", n); - - if (n < 0 || n > 9) - return NULL; - - n = bc->shiftlevel[n]; - *IsParam0 = (n == 0); - pp = bc->params; - - /* Step up the strings till we reach the end */ - /* or the one we want */ - while (*pp && n--) - pp += _tcslen (pp) + 1; - - return pp; + LPTSTR pp; + INT n = Char - _T('0'); + + TRACE ("FindArg: (%d)\n", n); + + if (n < 0 || n > 9) + return NULL; + + n = bc->shiftlevel[n]; + *IsParam0 = (n == 0); + pp = bc->params; + + /* Step up the strings till we reach the end */ + /* or the one we want */ + while (*pp && n--) + pp += _tcslen (pp) + 1; + + return pp; } @@ -108,51 +108,51 @@ * The parameters consist of null terminated strings with a final * NULL character signalling the end of the parameters. * -*/ + */ LPTSTR BatchParams (LPTSTR s1, LPTSTR s2) { - LPTSTR dp = (LPTSTR)cmd_alloc ((_tcslen(s1) + _tcslen(s2) + 3) * sizeof (TCHAR)); - - /* JPP 20-Jul-1998 added error checking */ - if (dp == NULL) - { - error_out_of_memory(); - return NULL; - } - - if (s1 && *s1) - { - s1 = _stpcpy (dp, s1); - *s1++ = _T('\0'); - } - else - s1 = dp; - - while (*s2) - { - BOOL inquotes = FALSE; - - /* Find next parameter */ - while (_istspace(*s2) || (*s2 && _tcschr(_T(",;="), *s2))) - s2++; - if (!*s2) - break; - - /* Copy it */ - do - { - if (!inquotes && (_istspace(*s2) || _tcschr(_T(",;="), *s2))) - break; - inquotes ^= (*s2 == _T('"')); - *s1++ = *s2++; - } while (*s2); - *s1++ = _T('\0'); - } - - *s1 = _T('\0'); - - return dp; + LPTSTR dp = (LPTSTR)cmd_alloc ((_tcslen(s1) + _tcslen(s2) + 3) * sizeof (TCHAR)); + + /* JPP 20-Jul-1998 added error checking */ + if (dp == NULL) + { + error_out_of_memory(); + return NULL; + } + + if (s1 && *s1) + { + s1 = _stpcpy (dp, s1); + *s1++ = _T('\0'); + } + else + s1 = dp; + + while (*s2) + { + BOOL inquotes = FALSE; + + /* Find next parameter */ + while (_istspace(*s2) || (*s2 && _tcschr(_T(",;="), *s2))) + s2++; + if (!*s2) + break; + + /* Copy it */ + do + { + if (!inquotes && (_istspace(*s2) || _tcschr(_T(",;="), *s2))) + break; + inquotes ^= (*s2 == _T('"')); + *s1++ = *s2++; + } while (*s2); + *s1++ = _T('\0'); + } + + *s1 = _T('\0'); + + return dp; } /* @@ -160,16 +160,16 @@ */ VOID ClearBatch() { - TRACE ("ClearBatch mem = %08x free = %d\n", bc->mem, bc->memfree); - - if (bc->mem && bc->memfree) - cmd_free(bc->mem); - - if (bc->raw_params) - cmd_free(bc->raw_params); - - if (bc->params) - cmd_free(bc->params); + TRACE ("ClearBatch mem = %08x free = %d\n", bc->mem, bc->memfree); + + if (bc->mem && bc->memfree) + cmd_free(bc->mem); + + if (bc->raw_params) + cmd_free(bc->raw_params); + + if (bc->params) + cmd_free(bc->params); } /* @@ -184,20 +184,20 @@ VOID ExitBatch() { - ClearBatch(); - - TRACE ("ExitBatch\n"); - - UndoRedirection(bc->RedirList, NULL); - FreeRedirection(bc->RedirList); - - /* Preserve echo state across batch calls */ - bEcho = bc->bEcho; - - while (bc->setlocal) - cmd_endlocal(_T("")); - - bc = bc->prev; + ClearBatch(); + + TRACE ("ExitBatch\n"); + + UndoRedirection(bc->RedirList, NULL); + FreeRedirection(bc->RedirList); + + /* Preserve echo state across batch calls */ + bEcho = bc->bEcho; + + while (bc->setlocal) + cmd_endlocal(_T("")); + + bc = bc->prev; } /* @@ -206,26 +206,26 @@ */ void BatchFile2Mem(HANDLE hBatchFile) { - TRACE ("BatchFile2Mem ()\n"); - - bc->memsize = GetFileSize(hBatchFile, NULL); - bc->mem = (char *)cmd_alloc(bc->memsize+1); /* 1 extra for '\0' */ - - /* if memory is available, read it in and close the file */ - if (bc->mem != NULL) - { - TRACE ("BatchFile2Mem memory %08x - %08x\n",bc->mem,bc->memsize); - SetFilePointer (hBatchFile, 0, NULL, FILE_BEGIN); - ReadFile(hBatchFile, (LPVOID)bc->mem, bc->memsize, &bc->memsize, NULL); - bc->mem[bc->memsize]='\0'; /* end this, so you can dump it as a string */ - bc->memfree=TRUE; /* this one needs to be freed */ - } - else - { - bc->memsize=0; /* this will prevent mem being accessed */ - bc->memfree=FALSE; - } - bc->mempos = 0; /* set position to the start */ + TRACE ("BatchFile2Mem ()\n"); + + bc->memsize = GetFileSize(hBatchFile, NULL); + bc->mem = (char *)cmd_alloc(bc->memsize+1); /* 1 extra for '\0' */ + + /* if memory is available, read it in and close the file */ + if (bc->mem != NULL) + { + TRACE ("BatchFile2Mem memory %08x - %08x\n",bc->mem,bc->memsize); + SetFilePointer (hBatchFile, 0, NULL, FILE_BEGIN); + ReadFile(hBatchFile, (LPVOID)bc->mem, bc->memsize, &bc->memsize, NULL); + bc->mem[bc->memsize]='\0'; /* end this, so you can dump it as a string */ + bc->memfree=TRUE; /* this one needs to be freed */ + } + else + { + bc->memsize=0; /* this will prevent mem being accessed */ + bc->memfree=FALSE; + } + bc->mempos = 0; /* set position to the start */ } /* @@ -234,97 +234,96 @@ * The firstword parameter is the full filename of the batch file. * */ - INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { - BATCH_CONTEXT new; - LPFOR_CONTEXT saved_fc; - INT i; - INT ret = 0; - BOOL same_fn = FALSE; - - HANDLE hFile = 0; - SetLastError(0); - if (bc && bc->mem) - { - TCHAR fpname[MAX_PATH]; - GetFullPathName(fullname, sizeof(fpname) / sizeof(TCHAR), fpname, NULL); - if (_tcsicmp(bc->BatchFilePath,fpname)==0) - same_fn=TRUE; - } - TRACE ("Batch: (\'%s\', \'%s\', \'%s\') same_fn = %d\n", - debugstr_aw(fullname), debugstr_aw(firstword), debugstr_aw(param), same_fn); - - if (!same_fn) - { - hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | - FILE_FLAG_SEQUENTIAL_SCAN, NULL); - - if (hFile == INVALID_HANDLE_VALUE) - { - ConErrResPuts(STRING_BATCH_ERROR); - return 1; - } - } - - if (bc != NULL && Cmd == bc->current) - { - /* Then we are transferring to another batch */ - ClearBatch(); - AddBatchRedirection(&Cmd->Redirections); - } - else - { - struct _SETLOCAL *setlocal = NULL; - - if (Cmd == NULL) - { - /* This is a CALL. CALL will set errorlevel to our return value, so - * in order to keep the value of errorlevel unchanged in the case - * of calling an empty batch file, we must return that same value. */ - ret = nErrorLevel; - } - else if (bc) - { - /* If a batch file runs another batch file as part of a compound command - * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ - - /* Get its SETLOCAL stack so it can be migrated to the new context */ - setlocal = bc->setlocal; - bc->setlocal = NULL; - ExitBatch(); - } - - /* Create a new context. This function will not - * return until this context has been exited */ - new.prev = bc; - /* copy some fields in the new structure if it is the same file */ - if (same_fn) { - new.mem = bc->mem; - new.memsize = bc->memsize; - new.mempos = 0; - new.memfree = FALSE; /* don't free this, being used before this */ - } - bc = &new; - bc->RedirList = NULL; - bc->setlocal = setlocal; - } - - GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); - /* if a new batch file, load it into memory and close the file */ - if (!same_fn) - { - BatchFile2Mem(hFile); - CloseHandle(hFile); - } - - bc->mempos = 0; /* goto begin of batch file */ - bc->bEcho = bEcho; /* Preserve echo across batch calls */ - for (i = 0; i < 10; i++) - bc->shiftlevel[i] = i; - - bc->params = BatchParams (firstword, param); + BATCH_CONTEXT new; + LPFOR_CONTEXT saved_fc; + INT i; + INT ret = 0; + BOOL same_fn = FALSE; + + HANDLE hFile = 0; + SetLastError(0); + if (bc && bc->mem) + { + TCHAR fpname[MAX_PATH]; + GetFullPathName(fullname, sizeof(fpname) / sizeof(TCHAR), fpname, NULL); + if (_tcsicmp(bc->BatchFilePath,fpname)==0) + same_fn=TRUE; + } + TRACE ("Batch: (\'%s\', \'%s\', \'%s\') same_fn = %d\n", + debugstr_aw(fullname), debugstr_aw(firstword), debugstr_aw(param), same_fn); + + if (!same_fn) + { + hFile = CreateFile(fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | + FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + ConErrResPuts(STRING_BATCH_ERROR); + return 1; + } + } + + if (bc != NULL && Cmd == bc->current) + { + /* Then we are transferring to another batch */ + ClearBatch(); + AddBatchRedirection(&Cmd->Redirections); + } + else + { + struct _SETLOCAL *setlocal = NULL; + + if (Cmd == NULL) + { + /* This is a CALL. CALL will set errorlevel to our return value, so + * in order to keep the value of errorlevel unchanged in the case + * of calling an empty batch file, we must return that same value. */ + ret = nErrorLevel; + } + else if (bc) + { + /* If a batch file runs another batch file as part of a compound command + * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ + + /* Get its SETLOCAL stack so it can be migrated to the new context */ + setlocal = bc->setlocal; + bc->setlocal = NULL; + ExitBatch(); + } + + /* Create a new context. This function will not + * return until this context has been exited */ + new.prev = bc; + /* copy some fields in the new structure if it is the same file */ + if (same_fn) { + new.mem = bc->mem; + new.memsize = bc->memsize; + new.mempos = 0; + new.memfree = FALSE; /* don't free this, being used before this */ + } + bc = &new; + bc->RedirList = NULL; + bc->setlocal = setlocal; + } + + GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); + /* if a new batch file, load it into memory and close the file */ + if (!same_fn) + { + BatchFile2Mem(hFile); + CloseHandle(hFile); + } + + bc->mempos = 0; /* goto begin of batch file */ + bc->bEcho = bEcho; /* Preserve echo across batch calls */ + for (i = 0; i < 10; i++) + bc->shiftlevel[i] = i; + + bc->params = BatchParams (firstword, param); // // Allocate enough memory to hold the params and copy them over without modifications // @@ -335,58 +334,58 @@ return 1; } - /* Check if this is a "CALL :label" */ - if (*firstword == _T(':')) - cmd_goto(firstword); - - /* If we are calling from inside a FOR, hide the FOR variables */ - saved_fc = fc; - fc = NULL; - - /* If we have created a new context, don't return - * until this batch file has completed. */ - while (bc == &new && !bExit) - { - Cmd = ParseCommand(NULL); - if (!Cmd) - continue; - - /* JPP 19980807 */ - /* Echo batch file line */ - if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) - { - if (!bIgnoreEcho) - ConOutChar(_T('\n')); - PrintPrompt(); - EchoCommand(Cmd); - ConOutChar(_T('\n')); - } - - bc->current = Cmd; - ret = ExecuteCommand(Cmd); - FreeCommand(Cmd); - } - - TRACE ("Batch: returns TRUE\n"); - - fc = saved_fc; - return ret; + /* Check if this is a "CALL :label" */ + if (*firstword == _T(':')) + cmd_goto(firstword); + + /* If we are calling from inside a FOR, hide the FOR variables */ + saved_fc = fc; + fc = NULL; + + /* If we have created a new context, don't return + * until this batch file has completed. */ + while (bc == &new && !bExit) + { + Cmd = ParseCommand(NULL); + if (!Cmd) + continue; + + /* JPP 19980807 */ + /* Echo batch file line */ + if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) + { + if (!bIgnoreEcho) + ConOutChar(_T('\n')); + PrintPrompt(); + EchoCommand(Cmd); + ConOutChar(_T('\n')); + } + + bc->current = Cmd; + ret = ExecuteCommand(Cmd); + FreeCommand(Cmd); + } + + TRACE ("Batch: returns TRUE\n"); + + fc = saved_fc; + return ret; } VOID AddBatchRedirection(REDIRECTION **RedirList) { - REDIRECTION **ListEnd; - - /* Prepend the list to the batch context's list */ - ListEnd = RedirList; - while (*ListEnd) - ListEnd = &(*ListEnd)->Next; - *ListEnd = bc->RedirList; - bc->RedirList = *RedirList; - - /* Null out the pointer so that the list will not be cleared prematurely. - * These redirections should persist until the batch file exits. */ - *RedirList = NULL; + REDIRECTION **ListEnd; + + /* Prepend the list to the batch context's list */ + ListEnd = RedirList; + while (*ListEnd) + ListEnd = &(*ListEnd)->Next; + *ListEnd = bc->RedirList; + bc->RedirList = *RedirList; + + /* Null out the pointer so that the list will not be cleared prematurely. + * These redirections should persist until the batch file exits. */ + *RedirList = NULL; } /* @@ -395,41 +394,41 @@ */ BOOL BatchGetString (LPTSTR lpBuffer, INT nBufferLength) { - LPSTR lpString; - INT len = 0; + LPSTR lpString; + INT len = 0; #ifdef _UNICODE - lpString = cmd_alloc(nBufferLength); + lpString = cmd_alloc(nBufferLength); #else - lpString = lpBuffer; + lpString = lpBuffer; #endif - /* read all chars from memory until a '\n' is encountered */ - if (bc->mem) - { - for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) - { - lpString[len] = bc->mem[bc->mempos++]; - if (lpString[len] == '\n' ) - { - len++; - break; - } - } - } - - if (!len) - { + /* read all chars from memory until a '\n' is encountered */ + if (bc->mem) + { + for (; (bc->mempos < bc->memsize && len < (nBufferLength-1)); len++) + { + lpString[len] = bc->mem[bc->mempos++]; + if (lpString[len] == '\n' ) + { + len++; + break; + } + } + } + + if (!len) + { #ifdef _UNICODE - cmd_free(lpString); + cmd_free(lpString); #endif - return FALSE; - } - - lpString[len++] = '\0'; + return FALSE; + } + + lpString[len++] = '\0'; #ifdef _UNICODE - MultiByteToWideChar(OutputCodePage, 0, lpString, -1, lpBuffer, len); - cmd_free(lpString); + MultiByteToWideChar(OutputCodePage, 0, lpString, -1, lpBuffer, len); + cmd_free(lpString); #endif - return TRUE; + return TRUE; } /* @@ -442,30 +441,30 @@ */ LPTSTR ReadBatchLine () { - TRACE ("ReadBatchLine ()\n"); - - /* User halt */ - if (CheckCtrlBreak (BREAK_BATCHFILE)) - { - while (bc) - ExitBatch(); - return NULL; - } - - if (!BatchGetString (textline, sizeof (textline) / sizeof (textline[0]) - 1)) - { - TRACE ("ReadBatchLine(): Reached EOF!\n"); - /* End of file.... */ - ExitBatch(); - return NULL; - } - - TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); - - if (textline[_tcslen(textline) - 1] != _T('\n')) - _tcscat(textline, _T("\n")); - - return textline; + TRACE ("ReadBatchLine ()\n"); + + /* User halt */ + if (CheckCtrlBreak (BREAK_BATCHFILE)) + { + while (bc) + ExitBatch(); + return NULL; + } + + if (!BatchGetString (textline, sizeof (textline) / sizeof (textline[0]) - 1)) + { + TRACE ("ReadBatchLine(): Reached EOF!\n"); + /* End of file.... */ + ExitBatch(); + return NULL; + } + + TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); + + if (textline[_tcslen(textline) - 1] != _T('\n')) + _tcscat(textline, _T("\n")); + + return textline; } /* EOF */ Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Jun 30 12:52:54 2013 @@ -7,13 +7,13 @@ * 20-Jan-1999 (Eric Kohl) * started * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) - * Remove all hardcode string to En.rc - * - * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) + * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * Remove all hardcoded strings in En.rc + * + * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu> * Added ConPrintfPaging and ConOutPrintfPaging * - * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com>) + * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com> * Fixed ConPrintfPaging */ @@ -28,441 +28,441 @@ VOID ConInDisable (VOID) { - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); - DWORD dwMode; - - GetConsoleMode (hInput, &dwMode); - dwMode &= ~ENABLE_PROCESSED_INPUT; - SetConsoleMode (hInput, dwMode); + HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + DWORD dwMode; + + GetConsoleMode (hInput, &dwMode); + dwMode &= ~ENABLE_PROCESSED_INPUT; + SetConsoleMode (hInput, dwMode); } VOID ConInEnable (VOID) { - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); - DWORD dwMode; - - GetConsoleMode (hInput, &dwMode); - dwMode |= ENABLE_PROCESSED_INPUT; - SetConsoleMode (hInput, dwMode); + HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + DWORD dwMode; + + GetConsoleMode (hInput, &dwMode); + dwMode |= ENABLE_PROCESSED_INPUT; + SetConsoleMode (hInput, dwMode); } VOID ConInFlush (VOID) { - FlushConsoleInputBuffer (GetStdHandle (STD_INPUT_HANDLE)); + FlushConsoleInputBuffer (GetStdHandle (STD_INPUT_HANDLE)); } VOID ConInKey (PINPUT_RECORD lpBuffer) { - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); - DWORD dwRead; - - if (hInput == INVALID_HANDLE_VALUE) - WARN ("Invalid input handle!!!\n"); - - do - { - ReadConsoleInput (hInput, lpBuffer, 1, &dwRead); - if ((lpBuffer->EventType == KEY_EVENT) && - (lpBuffer->Event.KeyEvent.bKeyDown == TRUE)) - break; - } - while (TRUE); + HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + DWORD dwRead; + + if (hInput == INVALID_HANDLE_VALUE) + WARN ("Invalid input handle!!!\n"); + + do + { + ReadConsoleInput (hInput, lpBuffer, 1, &dwRead); + if ((lpBuffer->EventType == KEY_EVENT) && + (lpBuffer->Event.KeyEvent.bKeyDown == TRUE)) + break; + } + while (TRUE); } VOID ConInString (LPTSTR lpInput, DWORD dwLength) { - DWORD dwOldMode; - DWORD dwRead = 0; - HANDLE hFile; - - LPTSTR p; - PCHAR pBuf; + DWORD dwOldMode; + DWORD dwRead = 0; + HANDLE hFile; + + LPTSTR p; + PCHAR pBuf; #ifdef _UNICODE - pBuf = (PCHAR)cmd_alloc(dwLength - 1); + pBuf = (PCHAR)cmd_alloc(dwLength - 1); #else - pBuf = lpInput; -#endif - ZeroMemory (lpInput, dwLength * sizeof(TCHAR)); - hFile = GetStdHandle (STD_INPUT_HANDLE); - GetConsoleMode (hFile, &dwOldMode); - - SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); - - ReadFile (hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); + pBuf = lpInput; +#endif + ZeroMemory (lpInput, dwLength * sizeof(TCHAR)); + hFile = GetStdHandle (STD_INPUT_HANDLE); + GetConsoleMode (hFile, &dwOldMode); + + SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + + ReadFile (hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); #ifdef _UNICODE - MultiByteToWideChar(InputCodePage, 0, pBuf, dwRead, lpInput, dwLength - 1); - cmd_free(pBuf); -#endif - for (p = lpInput; *p; p++) - { - if (*p == _T('\x0d')) - { - *p = _T('\0'); - break; - } - } - - SetConsoleMode (hFile, dwOldMode); + MultiByteToWideChar(InputCodePage, 0, pBuf, dwRead, lpInput, dwLength - 1); + cmd_free(pBuf); +#endif + for (p = lpInput; *p; p++) + { + if (*p == _T('\x0d')) + { + *p = _T('\0'); + break; + } + } + + SetConsoleMode (hFile, dwOldMode); } static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle) { - DWORD dwWritten; - HANDLE hOutput = GetStdHandle(nStdHandle); - - if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) - return; - - /* We're writing to a file or pipe instead of the console. Convert the - * string from TCHARs to the desired output format, if the two differ */ - if (bUnicodeOutput) - { + DWORD dwWritten; + HANDLE hOutput = GetStdHandle(nStdHandle); + + if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) + return; + + /* We're writing to a file or pipe instead of the console. Convert the + * string from TCHARs to the desired output format, if the two differ */ + if (bUnicodeOutput) + { #ifndef _UNICODE - WCHAR *buffer = cmd_alloc(len * sizeof(WCHAR)); - if (!buffer) - { - error_out_of_memory(); - return; - } - len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len); - str = (PVOID)buffer; -#endif - WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); + WCHAR *buffer = cmd_alloc(len * sizeof(WCHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } + len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len); + str = (PVOID)buffer; +#endif + WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); #ifndef _UNICODE - cmd_free(buffer); -#endif - } - else - { + cmd_free(buffer); +#endif + } + else + { #ifdef _UNICODE - CHAR *buffer = cmd_alloc(len * MB_LEN_MAX * sizeof(CHAR)); - if (!buffer) - { - error_out_of_memory(); - return; - } - len = WideCharToMultiByte(OutputCodePage, 0, str, len, buffer, len * MB_LEN_MAX, NULL, NULL); - str = (PVOID)buffer; -#endif - WriteFile(hOutput, str, len, &dwWritten, NULL); + CHAR *buffer = cmd_alloc(len * MB_LEN_MAX * sizeof(CHAR)); + if (!buffer) + { + error_out_of_memory(); + return; + } + len = WideCharToMultiByte(OutputCodePage, 0, str, len, buffer, len * MB_LEN_MAX, NULL, NULL); + str = (PVOID)buffer; +#endif + WriteFile(hOutput, str, len, &dwWritten, NULL); #ifdef _UNICODE - cmd_free(buffer); -#endif - } + cmd_free(buffer); +#endif + } } VOID ConOutChar (TCHAR c) { - ConWrite(&c, 1, STD_OUTPUT_HANDLE); + ConWrite(&c, 1, STD_OUTPUT_HANDLE); } VOID ConPuts(LPTSTR szText, DWORD nStdHandle) { - ConWrite(szText, _tcslen(szText), nStdHandle); + ConWrite(szText, _tcslen(szText), nStdHandle); } VOID ConOutResPaging(BOOL NewPage, UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintfPaging(NewPage, szMsg); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintfPaging(NewPage, szMsg); } VOID ConOutResPuts (UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - - ConPuts(szMsg, STD_OUTPUT_HANDLE); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + + ConPuts(szMsg, STD_OUTPUT_HANDLE); } VOID ConOutPuts (LPTSTR szText) { - ConPuts(szText, STD_OUTPUT_HANDLE); + ConPuts(szText, STD_OUTPUT_HANDLE); } VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { - TCHAR szOut[OUTPUT_BUFFER_SIZE]; - ConWrite(szOut, _vstprintf(szOut, szFormat, arg_ptr), nStdHandle); + TCHAR szOut[OUTPUT_BUFFER_SIZE]; + ConWrite(szOut, _vstprintf(szOut, szFormat, arg_ptr), nStdHandle); } INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { - INT len; - CONSOLE_SCREEN_BUFFER_INFO csbi; - TCHAR szOut[OUTPUT_BUFFER_SIZE]; - DWORD dwWritten; - HANDLE hOutput = GetStdHandle(nStdHandle); - - /* used to count number of lines since last pause */ - static int LineCount = 0; - - /* used to see how big the screen is */ - int ScreenLines = 0; - - /* chars since start of line */ - int CharSL; - - int from = 0, i = 0; - - if(NewPage == TRUE) - LineCount = 0; - - /* rest LineCount and return if no string have been given */ - if (szFormat == NULL) - return 0; - - - //get the size of the visual screen that can be printed too - if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) - { - // we assuming its a file handle - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } - //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() - ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; - CharSL = csbi.dwCursorPosition.X; - - //make sure they didnt make the screen to small - if(ScreenLines<4) - { - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } - - len = _vstprintf (szOut, szFormat, arg_ptr); - - while (i < len) - { - // Search until the end of a line is reached - if (szOut[i++] != _T('\n') && ++CharSL < csbi.dwSize.X) - continue; - - LineCount++; - CharSL=0; - - if(LineCount >= ScreenLines) - { - WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - from = i; - - if(PagePrompt() != PROMPT_YES) - { - return 1; - } - //reset the number of lines being printed - LineCount = 0; - } - } - - WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - - return 0; + INT len; + CONSOLE_SCREEN_BUFFER_INFO csbi; + TCHAR szOut[OUTPUT_BUFFER_SIZE]; + DWORD dwWritten; + HANDLE hOutput = GetStdHandle(nStdHandle); + + /* used to count number of lines since last pause */ + static int LineCount = 0; + + /* used to see how big the screen is */ + int ScreenLines = 0; + + /* chars since start of line */ + int CharSL; + + int from = 0, i = 0; + + if(NewPage == TRUE) + LineCount = 0; + + /* rest LineCount and return if no string have been given */ + if (szFormat == NULL) + return 0; + + + //get the size of the visual screen that can be printed too + if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) + { + // we assuming its a file handle + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } + //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() + ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + CharSL = csbi.dwCursorPosition.X; + + //make sure they didnt make the screen to small + if(ScreenLines<4) + { + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } + + len = _vstprintf (szOut, szFormat, arg_ptr); + + while (i < len) + { + // Search until the end of a line is reached + if (szOut[i++] != _T('\n') && ++CharSL < csbi.dwSize.X) + continue; + + LineCount++; + CharSL=0; + + if(LineCount >= ScreenLines) + { + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + from = i; + + if(PagePrompt() != PROMPT_YES) + { + return 1; + } + //reset the number of lines being printed + LineCount = 0; + } + } + + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + + return 0; } VOID ConErrFormatMessage (DWORD MessageId, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - DWORD ret; - LPTSTR text; - va_list arg_ptr; - - va_start (arg_ptr, MessageId); - ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - MessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, - 0, - &arg_ptr); - - va_end (arg_ptr); - if(ret > 0) - { - ConErrPuts (text); - LocalFree(text); - } - else - { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); - } + TCHAR szMsg[RC_STRING_MAX_SIZE]; + DWORD ret; + LPTSTR text; + va_list arg_ptr; + + va_start (arg_ptr, MessageId); + ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + MessageId, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &text, + 0, + &arg_ptr); + + va_end (arg_ptr); + if(ret > 0) + { + ConErrPuts (text); + LocalFree(text); + } + else + { + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg); + } } VOID ConOutFormatMessage (DWORD MessageId, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - DWORD ret; - LPTSTR text; - va_list arg_ptr; - - va_start (arg_ptr, MessageId); - ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - MessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, - 0, - &arg_ptr); - - va_end (arg_ptr); - if(ret > 0) - { - ConErrPuts (text); - LocalFree(text); - } - else - { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); - } + TCHAR szMsg[RC_STRING_MAX_SIZE]; + DWORD ret; + LPTSTR text; + va_list arg_ptr; + + va_start (arg_ptr, MessageId); + ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + MessageId, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &text, + 0, + &arg_ptr); + + va_end (arg_ptr); + if(ret > 0) + { + ConErrPuts (text); + LocalFree(text); + } + else + { + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg); + } } VOID ConOutResPrintf (UINT resID, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start (arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE); - va_end (arg_ptr); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start (arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); } VOID ConOutPrintf (LPTSTR szFormat, ...) { - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - ConPrintf(szFormat, arg_ptr, STD_OUTPUT_HANDLE); - va_end (arg_ptr); + va_list arg_ptr; + + va_start (arg_ptr, szFormat); + ConPrintf(szFormat, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); } INT ConOutPrintfPaging (BOOL NewPage, LPTSTR szFormat, ...) { - INT iReturn; - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - iReturn = ConPrintfPaging(NewPage, szFormat, arg_ptr, STD_OUTPUT_HANDLE); - va_end (arg_ptr); - return iReturn; + INT iReturn; + va_list arg_ptr; + + va_start (arg_ptr, szFormat); + iReturn = ConPrintfPaging(NewPage, szFormat, arg_ptr, STD_OUTPUT_HANDLE); + va_end (arg_ptr); + return iReturn; } VOID ConErrChar (TCHAR c) { - ConWrite(&c, 1, STD_ERROR_HANDLE); + ConWrite(&c, 1, STD_ERROR_HANDLE); } VOID ConErrResPuts (UINT resID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConPuts(szMsg, STD_ERROR_HANDLE); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPuts(szMsg, STD_ERROR_HANDLE); } VOID ConErrPuts (LPTSTR szText) { - ConPuts(szText, STD_ERROR_HANDLE); + ConPuts(szText, STD_ERROR_HANDLE); } VOID ConErrResPrintf (UINT resID, ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start (arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); - ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE); - va_end (arg_ptr); + TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start (arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE); + va_end (arg_ptr); } VOID ConErrPrintf (LPTSTR szFormat, ...) { - va_list arg_ptr; - - va_start (arg_ptr, szFormat); - ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); - va_end (arg_ptr); + va_list arg_ptr; + + va_start (arg_ptr, szFormat); + ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); + va_end (arg_ptr); } VOID SetCursorXY (SHORT x, SHORT y) { - COORD coPos; - - coPos.X = x; - coPos.Y = y; - SetConsoleCursorPosition (GetStdHandle (STD_OUTPUT_HANDLE), coPos); + COORD coPos; + + coPos.X = x; + coPos.Y = y; + SetConsoleCursorPosition (GetStdHandle (STD_OUTPUT_HANDLE), coPos); } VOID GetCursorXY (PSHORT x, PSHORT y) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); - - *x = csbi.dwCursorPosition.X; - *y = csbi.dwCursorPosition.Y; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + *x = csbi.dwCursorPosition.X; + *y = csbi.dwCursorPosition.Y; } SHORT GetCursorX (VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); - - return csbi.dwCursorPosition.X; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + return csbi.dwCursorPosition.X; } SHORT GetCursorY (VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); - - return csbi.dwCursorPosition.Y; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + return csbi.dwCursorPosition.Y; } VOID GetScreenSize (PSHORT maxx, PSHORT maxy) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) - { - csbi.dwSize.X = 80; - csbi.dwSize.Y = 25; - } - - if (maxx) - *maxx = csbi.dwSize.X; - if (maxy) - *maxy = csbi.dwSize.Y; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) + { + csbi.dwSize.X = 80; + csbi.dwSize.Y = 25; + } + + if (maxx) + *maxx = csbi.dwSize.X; + if (maxy) + *maxy = csbi.dwSize.Y; } VOID SetCursorType (BOOL bInsert, BOOL bVisible) { - CONSOLE_CURSOR_INFO cci; - - cci.dwSize = bInsert ? 10 : 99; - cci.bVisible = bVisible; - - SetConsoleCursorInfo (GetStdHandle (STD_OUTPUT_HANDLE), &cci); + CONSOLE_CURSOR_INFO cci; + + cci.dwSize = bInsert ? 10 : 99; + cci.bVisible = bVisible; + + SetConsoleCursorInfo (GetStdHandle (STD_OUTPUT_HANDLE), &cci); } /* EOF */ Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Sun Jun 30 12:52:54 2013 @@ -52,28 +52,28 @@ enum { - DEL_ATTRIBUTES = 0x001, /* /A */ - DEL_NOTHING = 0x004, /* /N */ - DEL_PROMPT = 0x008, /* /P */ - DEL_QUIET = 0x010, /* /Q */ - DEL_SUBDIR = 0x020, /* /S */ - DEL_TOTAL = 0x040, /* /T */ - DEL_WIPE = 0x080, /* /W */ - DEL_EMPTYDIR = 0x100, /* /X : not implemented */ - DEL_YES = 0x200, /* /Y */ - DEL_FORCE = 0x800 /* /F */ + DEL_ATTRIBUTES = 0x001, /* /A */ + DEL_NOTHING = 0x004, /* /N */ + DEL_PROMPT = 0x008, /* /P */ + DEL_QUIET = 0x010, /* /Q */ + DEL_SUBDIR = 0x020, /* /S */ + DEL_TOTAL = 0x040, /* /T */ + DEL_WIPE = 0x080, /* /W */ + DEL_EMPTYDIR = 0x100, /* /X : not implemented */ + DEL_YES = 0x200, /* /Y */ + DEL_FORCE = 0x800 /* /F */ }; enum { - ATTR_ARCHIVE = 0x001, /* /A:A */ - ATTR_HIDDEN = 0x002, /* /A:H */ - ATTR_SYSTEM = 0x004, /* /A:S */ - ATTR_READ_ONLY = 0x008, /* /A:R */ - ATTR_N_ARCHIVE = 0x010, /* /A:-A */ - ATTR_N_HIDDEN = 0x020, /* /A:-H */ - ATTR_N_SYSTEM = 0x040, /* /A:-S */ - ATTR_N_READ_ONLY = 0x080 /* /A:-R */ + ATTR_ARCHIVE = 0x001, /* /A:A */ + ATTR_HIDDEN = 0x002, /* /A:H */ + ATTR_SYSTEM = 0x004, /* /A:S */ + ATTR_READ_ONLY = 0x008, /* /A:R */ + ATTR_N_ARCHIVE = 0x010, /* /A:-A */ + ATTR_N_HIDDEN = 0x020, /* /A:-H */ + ATTR_N_SYSTEM = 0x040, /* /A:-S */ + ATTR_N_READ_ONLY = 0x080 /* /A:-R */ }; static TCHAR szDeleteWipe[RC_STRING_MAX_SIZE]; @@ -83,471 +83,460 @@ static VOID LoadStrings(VOID) { - LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, RC_STRING_MAX_SIZE); - GetModuleFileName(NULL, CMDPath, MAX_PATH); - StringsLoaded = TRUE; + LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, RC_STRING_MAX_SIZE); + GetModuleFileName(NULL, CMDPath, MAX_PATH); + StringsLoaded = TRUE; } static BOOL RemoveFile (LPTSTR lpFileName, DWORD dwFlags, WIN32_FIND_DATA* f) { - /*This function is called by CommandDelete and - does the actual process of deleting the single - file*/ - if(CheckCtrlBreak(BREAK_INPUT)) - return 1; - - /*check to see if it is read only and if this is done based on /A - if it is done by file name, access is denied. However, if it is done - using the /A switch you must un-read only the file and allow it to be - deleted*/ - if((dwFlags & DEL_ATTRIBUTES) || (dwFlags & DEL_FORCE)) - { - if(f->dwFileAttributes & FILE_ATTRIBUTE_READONLY) - { - /*setting file to normal, not saving old attrs first - because the file is going to be deleted anyways - so the only thing that matters is that it isn't - read only.*/ - SetFileAttributes(lpFileName,FILE_ATTRIBUTE_NORMAL); - } - } - - if (dwFlags & DEL_WIPE) - { - - HANDLE file; - DWORD temp; + /*This function is called by CommandDelete and + does the actual process of deleting the single + file*/ + if (CheckCtrlBreak(BREAK_INPUT)) + return 1; + + /*check to see if it is read only and if this is done based on /A + if it is done by file name, access is denied. However, if it is done + using the /A switch you must un-read only the file and allow it to be + deleted*/ + if ((dwFlags & DEL_ATTRIBUTES) || (dwFlags & DEL_FORCE)) + { + if (f->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + /*setting file to normal, not saving old attrs first + because the file is going to be deleted anyways + so the only thing that matters is that it isn't + read only.*/ + SetFileAttributes(lpFileName,FILE_ATTRIBUTE_NORMAL); + } + } + + if (dwFlags & DEL_WIPE) + { + HANDLE file; + DWORD temp; #define BufferSize 65536 - BYTE buffer[BufferSize]; - LONGLONG i; - LARGE_INTEGER FileSize; - - FileSize.u.HighPart = f->nFileSizeHigh; - FileSize.u.LowPart = f->nFileSizeLow; - - for(i = 0; i < BufferSize; i++) - { - buffer[i]=rand() % 256; - } - file = CreateFile (lpFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_WRITE_THROUGH, NULL); - if (file != INVALID_HANDLE_VALUE) - { - for(i = 0; i < (FileSize.QuadPart - BufferSize); i += BufferSize) - { - WriteFile (file, buffer, BufferSize, &temp, NULL); - ConOutPrintf (_T("%I64d%% %s\r"),(i * (LONGLONG)100)/FileSize.QuadPart,szDeleteWipe); - } - WriteFile (file, buffer, (DWORD)(FileSize.QuadPart - i), &temp, NULL); - ConOutPrintf (_T("100%% %s\n"),szDeleteWipe); - CloseHandle (file); - } - } - - return DeleteFile (lpFileName); + BYTE buffer[BufferSize]; + LONGLONG i; + LARGE_INTEGER FileSize; + + FileSize.u.HighPart = f->nFileSizeHigh; + FileSize.u.LowPart = f->nFileSizeLow; + + for(i = 0; i < BufferSize; i++) + { + buffer[i]=rand() % 256; + } + file = CreateFile (lpFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_WRITE_THROUGH, NULL); + if (file != INVALID_HANDLE_VALUE) + { + for(i = 0; i < (FileSize.QuadPart - BufferSize); i += BufferSize) + { + WriteFile (file, buffer, BufferSize, &temp, NULL); + ConOutPrintf (_T("%I64d%% %s\r"),(i * (LONGLONG)100)/FileSize.QuadPart,szDeleteWipe); + } + WriteFile (file, buffer, (DWORD)(FileSize.QuadPart - i), &temp, NULL); + ConOutPrintf (_T("100%% %s\n"),szDeleteWipe); + CloseHandle (file); + } + } + + return DeleteFile (lpFileName); } static DWORD DeleteFiles(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) { - TCHAR szFullPath[MAX_PATH]; - TCHAR szFileName[MAX_PATH]; - LPTSTR pFilePart; - HANDLE hFile; - WIN32_FIND_DATA f; - BOOL bExclusion; - INT res; - DWORD dwFiles = 0; - - _tcscpy(szFileName, FileName); - - if(_tcschr (szFileName, _T('*')) == NULL && - IsExistingDirectory (szFileName)) - { - /* If it doesnt have a \ at the end already then on needs to be added */ - if(szFileName[_tcslen(szFileName) - 1] != _T('\\')) - _tcscat (szFileName, _T("\\")); - /* Add a wildcard after the \ */ - _tcscat (szFileName, _T("*")); - } - - if(!_tcscmp (szFileName, _T("*")) || - !_tcscmp (szFileName, _T("*.*")) || - (szFileName[_tcslen(szFileName) - 2] == _T('\\') && szFileName[_tcslen(szFileName) - 1] == _T('*'))) - { - /* well, the user wants to delete everything but if they didnt yes DEL_YES, DEL_QUIET, or DEL_PROMPT - then we are going to want to make sure that in fact they want to do that. */ - - if (!((*dwFlags & DEL_YES) || (*dwFlags & DEL_QUIET) || (*dwFlags & DEL_PROMPT))) - { - res = FilePromptYNA (STRING_DEL_HELP2); - if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) - return 0x80000000; - if(res == PROMPT_ALL) - *dwFlags |= DEL_YES; - } - } - - GetFullPathName (szFileName, - MAX_PATH, - szFullPath, - &pFilePart); + TCHAR szFullPath[MAX_PATH]; + TCHAR szFileName[MAX_PATH]; + LPTSTR pFilePart; + HANDLE hFile; + WIN32_FIND_DATA f; + BOOL bExclusion; + INT res; + DWORD dwFiles = 0; + + _tcscpy(szFileName, FileName); + + if (_tcschr (szFileName, _T('*')) == NULL && + IsExistingDirectory (szFileName)) + { + /* If it doesnt have a \ at the end already then on needs to be added */ + if (szFileName[_tcslen(szFileName) - 1] != _T('\\')) + _tcscat (szFileName, _T("\\")); + /* Add a wildcard after the \ */ + _tcscat (szFileName, _T("*")); + } + + if (!_tcscmp (szFileName, _T("*")) || + !_tcscmp (szFileName, _T("*.*")) || + (szFileName[_tcslen(szFileName) - 2] == _T('\\') && szFileName[_tcslen(szFileName) - 1] == _T('*'))) + { + /* well, the user wants to delete everything but if they didnt yes DEL_YES, DEL_QUIET, or DEL_PROMPT + then we are going to want to make sure that in fact they want to do that. */ + + if (!((*dwFlags & DEL_YES) || (*dwFlags & DEL_QUIET) || (*dwFlags & DEL_PROMPT))) + { + res = FilePromptYNA (STRING_DEL_HELP2); + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + return 0x80000000; + if (res == PROMPT_ALL) + *dwFlags |= DEL_YES; + } + } + + GetFullPathName(szFileName, + MAX_PATH, + szFullPath, + &pFilePart); + + hFile = FindFirstFile(szFullPath, &f); + if (hFile != INVALID_HANDLE_VALUE) + { + do + { + bExclusion = FALSE; + + /*if it is going to be excluded by - no need to check attrs*/ + if (*dwFlags & DEL_ATTRIBUTES && !bExclusion) + { + /*save if file attr check if user doesnt care about that attr anyways*/ + if (dwAttrFlags & ATTR_ARCHIVE && !(f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_HIDDEN && !(f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_SYSTEM && !(f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_READ_ONLY && !(f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_ARCHIVE && (f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_HIDDEN && (f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_SYSTEM && (f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) + bExclusion = TRUE; + if (dwAttrFlags & ATTR_N_READ_ONLY && (f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + bExclusion = TRUE; + } + if (bExclusion) continue; + + /* ignore directories */ + if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + + _tcscpy (pFilePart, f.cFileName); + + /* We cant delete ourselves */ + if (!_tcscmp (CMDPath,szFullPath)) continue; + + TRACE("Full filename: %s\n", debugstr_aw(szFullPath)); + + /* ask for deleting */ + if (*dwFlags & DEL_PROMPT) + { + ConErrResPrintf(STRING_DEL_ERROR5, szFullPath); + + res = FilePromptYN (STRING_DEL_ERROR6); + + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) + { + nErrorLevel = 0; + continue; + } + } + + /*user cant ask it to be quiet and tell you what it did*/ + if (!(*dwFlags & DEL_QUIET) && !(*dwFlags & DEL_TOTAL)) + { + ConErrResPrintf(STRING_DEL_ERROR7, szFullPath); + } + + /* delete the file */ + if (*dwFlags & DEL_NOTHING) continue; + + if (RemoveFile (szFullPath, *dwFlags, &f)) + { + dwFiles++; + } + else + { + ErrorMessage (GetLastError(), _T("")); +// FindClose(hFile); +// return -1; + } + } + while (FindNextFile (hFile, &f)); + FindClose (hFile); + } + else error_sfile_not_found(szFullPath); + return dwFiles; +} + +static DWORD +ProcessDirectory(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) +{ + TCHAR szFullPath[MAX_PATH]; + LPTSTR pFilePart; + LPTSTR pSearchPart; + HANDLE hFile; + WIN32_FIND_DATA f; + DWORD dwFiles = 0; + + GetFullPathName(FileName, + MAX_PATH, + szFullPath, + &pFilePart); + + dwFiles = DeleteFiles(szFullPath, dwFlags, dwAttrFlags); + if (dwFiles & 0x80000000) return dwFiles; + + if (*dwFlags & DEL_SUBDIR) + { + /* Get just the file name */ + pSearchPart = _tcsrchr(FileName,_T('\\')); + if (pSearchPart != NULL) + pSearchPart++; + else + pSearchPart = FileName; + + /* Get the full path to the file */ + GetFullPathName (FileName,MAX_PATH,szFullPath,NULL); + + /* strip the filename off of it */ + pFilePart = _tcsrchr(szFullPath, _T('\\')); + if (pFilePart == NULL) + { + pFilePart = szFullPath; + } + else + { + pFilePart++; + } + + _tcscpy(pFilePart, _T("*")); hFile = FindFirstFile(szFullPath, &f); if (hFile != INVALID_HANDLE_VALUE) { - do - { - bExclusion = FALSE; - - /*if it is going to be excluded by - no need to check attrs*/ - if(*dwFlags & DEL_ATTRIBUTES && !bExclusion) - { - - /*save if file attr check if user doesnt care about that attr anyways*/ - if(dwAttrFlags & ATTR_ARCHIVE && !(f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_HIDDEN && !(f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_SYSTEM && !(f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_READ_ONLY && !(f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_ARCHIVE && (f.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_HIDDEN && (f.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_SYSTEM && (f.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) - bExclusion = TRUE; - if(dwAttrFlags & ATTR_N_READ_ONLY && (f.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - bExclusion = TRUE; - } - if(bExclusion) - continue; - - /* ignore directories */ - if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - - - _tcscpy (pFilePart, f.cFileName); - - /* We cant delete ourselves */ - if(!_tcscmp (CMDPath,szFullPath)) - continue; - - - TRACE("Full filename: %s\n", debugstr_aw(szFullPath)); - - /* ask for deleting */ - if (*dwFlags & DEL_PROMPT) - { - ConErrResPrintf(STRING_DEL_ERROR5, szFullPath); - - res = FilePromptYN (STRING_DEL_ERROR6); - - if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) - { - nErrorLevel = 0; - continue; - } - } - - /*user cant ask it to be quiet and tell you what it did*/ - if (!(*dwFlags & DEL_QUIET) && !(*dwFlags & DEL_TOTAL)) - { - ConErrResPrintf(STRING_DEL_ERROR7, szFullPath); - } - - /* delete the file */ - if(*dwFlags & DEL_NOTHING) - continue; - - if(RemoveFile (szFullPath, *dwFlags, &f)) - dwFiles++; - else + do + { + if (!(f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || + !_tcscmp(f.cFileName, _T(".")) || + !_tcscmp(f.cFileName, _T(".."))) + continue; + + _tcscpy(pFilePart, f.cFileName); + _tcscat(pFilePart, _T("\\")); + _tcscat(pFilePart, pSearchPart); + + dwFiles +=ProcessDirectory(szFullPath, dwFlags, dwAttrFlags); + if (dwFiles & 0x80000000) + { + break; + } + } + while (FindNextFile (hFile, &f)); + FindClose (hFile); + } + } + return dwFiles; +} + + + +INT CommandDelete (LPTSTR param) +{ + /*cmd is the command that was given, in this case it will always be "del" or "delete" + param is whatever is given after the command*/ + + LPTSTR *arg = NULL; + INT args; + INT i; + INT nEvalArgs = 0; /* nunber of evaluated arguments */ + DWORD dwFlags = 0; + DWORD dwAttrFlags = 0; + DWORD dwFiles = 0; + LONG ch; + TCHAR szOrginalArg[MAX_PATH]; + + /*checks the first two chars of param to see if it is /? + this however allows the following command to not show help + "del frog.txt /?" */ + + if (!StringsLoaded) + { + LoadStrings(); + } + + if (!_tcsncmp (param, _T("/?"), 2)) + { + ConOutResPaging(TRUE,STRING_DEL_HELP1); + return 0; + } + + nErrorLevel = 0; + + arg = split (param, &args, FALSE, FALSE); + + if (args == 0) + { + /* only command given */ + error_req_param_missing (); + freep (arg); + return 1; + } + /* 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) + { + ch = _totupper (arg[i][1]); + if (ch == _T('N')) + { + dwFlags |= DEL_NOTHING; + } + else if (ch == _T('P')) + { + dwFlags |= DEL_PROMPT; + } + else if (ch == _T('Q')) + { + dwFlags |= DEL_QUIET; + } + else if (ch == _T('F')) + { + dwFlags |= DEL_FORCE; + } + else if (ch == _T('S')) + { + dwFlags |= DEL_SUBDIR; + } + else if (ch == _T('T')) + { + dwFlags |= DEL_TOTAL; + } + else if (ch == _T('W')) + { + dwFlags |= DEL_WIPE; + } + else if (ch == _T('Y')) + { + dwFlags |= DEL_YES; + } + else if (ch == _T('A')) + { + dwFlags |= DEL_ATTRIBUTES; + /*the proper syntax for /A has a min of 4 chars + i.e. /A:R or /A:-H */ + if (_tcslen (arg[i]) < 4) + { + error_invalid_parameter_format(arg[i]); + return 0; + } + ch = _totupper (arg[i][3]); + if (_tcslen (arg[i]) == 4) + { + if (ch == _T('A')) { - ErrorMessage (GetLastError(), _T("")); -// FindClose(hFile); -// return -1; - } - } - while (FindNextFile (hFile, &f)); - FindClose (hFile); - } - else error_sfile_not_found(szFullPath); - return dwFiles; + dwAttrFlags |= ATTR_ARCHIVE; + } + if (ch == _T('H')) + { + dwAttrFlags |= ATTR_HIDDEN; + } + if (ch == _T('S')) + { + dwAttrFlags |= ATTR_SYSTEM; + } + if (ch == _T('R')) + { + dwAttrFlags |= ATTR_READ_ONLY; + } + } + if (_tcslen (arg[i]) == 5) + { + if (ch == _T('-')) + { + ch = _totupper (arg[i][4]); + if (ch == _T('A')) + { + dwAttrFlags |= ATTR_N_ARCHIVE; + } + if (ch == _T('H')) + { + dwAttrFlags |= ATTR_N_HIDDEN; + } + if (ch == _T('S')) + { + dwAttrFlags |= ATTR_N_SYSTEM; + } + if (ch == _T('R')) + { + dwAttrFlags |= ATTR_N_READ_ONLY; + } + } + } + } + } + + nEvalArgs++; + } + } + + /* there are only options on the command line --> error!!! + there is the same number of args as there is flags, so none of the args were filenames*/ + if (args == nEvalArgs) + { + error_req_param_missing (); + freep (arg); + return 1; + } + + /* keep quiet within batch files */ + if (bc != NULL) dwFlags |= DEL_QUIET; + + /* check for filenames anywhere in command line */ + for (i = 0; i < args && !(dwFiles & 0x80000000); i++) + { + /*this checks to see if it is a flag; if it isn't, we assume it is a file name*/ + if ((*arg[i] == _T('/')) || (*arg[i] == _T('-'))) + continue; + + /* We want to make a copies of the argument */ + if (_tcslen(arg[i]) == 2 && arg[i][1] == _T(':')) + { + /* Check for C: D: ... */ + GetRootPath(arg[i], szOrginalArg, MAX_PATH); + } + else + { + _tcscpy(szOrginalArg,arg[i]); + } + dwFiles += ProcessDirectory(szOrginalArg, &dwFlags, dwAttrFlags); + } + + freep (arg); + + /*Based on MS cmd, we only tell what files are being deleted when /S is used */ + if (dwFlags & DEL_TOTAL) + { + dwFiles &= 0x7fffffff; + if (dwFiles < 2) + { + ConOutResPrintf(STRING_DEL_HELP3, dwFiles); + } + else + { + ConOutResPrintf(STRING_DEL_HELP4, dwFiles); + } + } + + return 0; } -static DWORD -ProcessDirectory(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) -{ - TCHAR szFullPath[MAX_PATH]; - LPTSTR pFilePart; - LPTSTR pSearchPart; - HANDLE hFile; - WIN32_FIND_DATA f; - DWORD dwFiles = 0; - - GetFullPathName (FileName, - MAX_PATH, - szFullPath, - &pFilePart); - - dwFiles = DeleteFiles(szFullPath, dwFlags, dwAttrFlags); - if (dwFiles & 0x80000000) - return dwFiles; - - if (*dwFlags & DEL_SUBDIR) - { - /* Get just the file name */ - pSearchPart = _tcsrchr(FileName,_T('\\')); - if(pSearchPart != NULL) - pSearchPart++; - else - pSearchPart = FileName; - - /* Get the full path to the file */ - GetFullPathName (FileName,MAX_PATH,szFullPath,NULL); - - /* strip the filename off of it */ - pFilePart = _tcsrchr(szFullPath, _T('\\')); - if (pFilePart == NULL) - { - pFilePart = szFullPath; - } - else - { - pFilePart++; - } - - _tcscpy(pFilePart, _T("*")); - - hFile = FindFirstFile(szFullPath, &f); - if (hFile != INVALID_HANDLE_VALUE) - { - do - { - if (!(f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !_tcscmp(f.cFileName, _T(".")) || - !_tcscmp(f.cFileName, _T(".."))) - continue; - - _tcscpy(pFilePart, f.cFileName); - _tcscat(pFilePart, _T("\\")); - _tcscat(pFilePart, pSearchPart); - - dwFiles +=ProcessDirectory(szFullPath, dwFlags, dwAttrFlags); - if (dwFiles & 0x80000000) - { - break; - } - } - while (FindNextFile (hFile, &f)); - FindClose (hFile); - } - } - return dwFiles; -} - - - -INT CommandDelete (LPTSTR param) -{ - /*cmd is the command that was given, in this case it will always be "del" or "delete" - param is whatever is given after the command*/ - - LPTSTR *arg = NULL; - INT args; - INT i; - INT nEvalArgs = 0; /* nunber of evaluated arguments */ - DWORD dwFlags = 0; - DWORD dwAttrFlags = 0; - DWORD dwFiles = 0; - LONG ch; - TCHAR szOrginalArg[MAX_PATH]; - - /*checks the first two chars of param to see if it is /? - this however allows the following command to not show help - "del frog.txt /?" */ - - if (!StringsLoaded) - { - LoadStrings(); - } - - if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutResPaging(TRUE,STRING_DEL_HELP1); - return 0; - } - - nErrorLevel = 0; - - arg = split (param, &args, FALSE, FALSE); - - if (args == 0) - { - /* only command given */ - error_req_param_missing (); - freep (arg); - return 1; - } - /* 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) - { - ch = _totupper (arg[i][1]); - if (ch == _T('N')) - { - dwFlags |= DEL_NOTHING; - } - else if (ch == _T('P')) - { - dwFlags |= DEL_PROMPT; - } - else if (ch == _T('Q')) - { - dwFlags |= DEL_QUIET; - } - else if (ch == _T('F')) - { - dwFlags |= DEL_FORCE; - } - else if (ch == _T('S')) - { - dwFlags |= DEL_SUBDIR; - } - else if (ch == _T('T')) - { - dwFlags |= DEL_TOTAL; - } - else if (ch == _T('W')) - { - dwFlags |= DEL_WIPE; - } - else if (ch == _T('Y')) - { - dwFlags |= DEL_YES; - } - else if (ch == _T('A')) - { - - dwFlags |= DEL_ATTRIBUTES; - /*the proper syntax for /A has a min of 4 chars - i.e. /A:R or /A:-H */ - if (_tcslen (arg[i]) < 4) - { - error_invalid_parameter_format(arg[i]); - return 0; - } - ch = _totupper (arg[i][3]); - if (_tcslen (arg[i]) == 4) - { - if(ch == _T('A')) - { - dwAttrFlags |= ATTR_ARCHIVE; - } - if(ch == _T('H')) - { - dwAttrFlags |= ATTR_HIDDEN; - } - if(ch == _T('S')) - { - dwAttrFlags |= ATTR_SYSTEM; - } - if(ch == _T('R')) - { - dwAttrFlags |= ATTR_READ_ONLY; - } - } - if (_tcslen (arg[i]) == 5) - { - if(ch == _T('-')) - { - ch = _totupper (arg[i][4]); - if(ch == _T('A')) - { - dwAttrFlags |= ATTR_N_ARCHIVE; - } - if(ch == _T('H')) - { - dwAttrFlags |= ATTR_N_HIDDEN; - } - if(ch == _T('S')) - { - dwAttrFlags |= ATTR_N_SYSTEM; - } - if(ch == _T('R')) - { - dwAttrFlags |= ATTR_N_READ_ONLY; - } - } - } - } - } - - nEvalArgs++; - } - } - - /* there are only options on the command line --> error!!! - there is the same number of args as there is flags, so none of the args were filenames*/ - if (args == nEvalArgs) - { - error_req_param_missing (); - freep (arg); - return 1; - } - - /* keep quiet within batch files */ - if (bc != NULL) - dwFlags |= DEL_QUIET; - - /* check for filenames anywhere in command line */ - for (i = 0; i < args && !(dwFiles & 0x80000000); i++) - { - - /*this checks to see if it is a flag; if it isn't, we assume it is a file name*/ - if((*arg[i] == _T('/')) || (*arg[i] == _T('-'))) - continue; - - /* We want to make a copies of the argument */ - if(_tcslen(arg[i]) == 2 && arg[i][1] == _T(':')) - { - /* Check for C: D: ... */ - GetRootPath(arg[i],szOrginalArg,MAX_PATH); - } - else - { - _tcscpy(szOrginalArg,arg[i]); - } - dwFiles += ProcessDirectory(szOrginalArg, &dwFlags, dwAttrFlags); - - } - - freep (arg); - - /*Based on MS cmd, we only tell what files are being deleted when /S is used */ - if (dwFlags & DEL_TOTAL) - { - dwFiles &= 0x7fffffff; - if (dwFiles < 2) - { - ConOutResPrintf(STRING_DEL_HELP3, dwFiles); - } - else - { - ConOutResPrintf(STRING_DEL_HELP4, dwFiles); - } - } - - return 0; -} - #endif

11 years, 5 months

[hbelusca] 59385: [CMD] Fix whitespace (part 5/6) (convert tabs into 4-space indent).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 30 12:38:11 2013 New Revision: 59385 URL: http://svn.reactos.org/svn/reactos?rev=59385&view=rev Log: [CMD] Fix whitespace (part 5/6) (convert tabs into 4-space indent). Modified: trunk/reactos/base/shell/cmd/chcp.c trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] Sun Jun 30 12:38:11 2013 @@ -73,7 +73,6 @@ } freep (arg); - return 0; } Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Sun Jun 30 12:38:11 2013 @@ -27,8 +27,8 @@ * 04-Feb-1999 (Eric Kohl) * Fixed date input bug. * - * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) - * Remove all hardcode string to En.rc + * 03-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com> + * Remove all hardcoded strings in En.rc */ #include "precomp.h" @@ -38,227 +38,222 @@ static WORD awMonths[2][13] = { - {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, - {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} + {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} }; static VOID PrintDateString (VOID) { - switch (nDateFormat) - { - case 0: /* mmddyy */ - default: - ConOutResPrintf(STRING_DATE_HELP1, cDateSeparator, cDateSeparator); - break; - - case 1: /* ddmmyy */ - ConOutResPrintf(STRING_DATE_HELP2, cDateSeparator, cDateSeparator); - break; - - case 2: /* yymmdd */ - ConOutResPrintf(STRING_DATE_HELP3, cDateSeparator, cDateSeparator); - break; - } -} - + switch (nDateFormat) + { + case 0: /* mmddyy */ + default: + ConOutResPrintf(STRING_DATE_HELP1, cDateSeparator, cDateSeparator); + break; + + case 1: /* ddmmyy */ + ConOutResPrintf(STRING_DATE_HELP2, cDateSeparator, cDateSeparator); + break; + + case 2: /* yymmdd */ + ConOutResPrintf(STRING_DATE_HELP3, cDateSeparator, cDateSeparator); + break; + } +} static BOOL ReadNumber (LPTSTR *s, LPWORD lpwValue) { - if (_istdigit (**s)) - { - while (_istdigit (**s)) - { - *lpwValue = *lpwValue * 10 + **s - _T('0'); - (*s)++; - } - return TRUE; - } - return FALSE; -} - + if (_istdigit (**s)) + { + while (_istdigit (**s)) + { + *lpwValue = *lpwValue * 10 + **s - _T('0'); + (*s)++; + } + return TRUE; + } + return FALSE; +} static BOOL ReadSeparator (LPTSTR *s) { - if (**s == _T('/') || **s == _T('-') || **s == cDateSeparator) - { - (*s)++; - return TRUE; - } - return FALSE; -} - + if (**s == _T('/') || **s == _T('-') || **s == cDateSeparator) + { + (*s)++; + return TRUE; + } + return FALSE; +} static BOOL ParseDate (LPTSTR s) { - SYSTEMTIME d; - unsigned char leap; - LPTSTR p = s; - - if (!*s) - return TRUE; - - GetLocalTime (&d); - - d.wYear = 0; - d.wDay = 0; - d.wMonth = 0; - - switch (nDateFormat) - { - case 0: /* mmddyy */ - default: - if (!ReadNumber (&p, &d.wMonth)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wDay)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wYear)) - return FALSE; - break; - - case 1: /* ddmmyy */ - if (!ReadNumber (&p, &d.wDay)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wMonth)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wYear)) - return FALSE; - break; - - case 2: /* yymmdd */ - if (!ReadNumber (&p, &d.wYear)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wMonth)) - return FALSE; - if (!ReadSeparator (&p)) - return FALSE; - if (!ReadNumber (&p, &d.wDay)) - return FALSE; - break; - } - - /* if only entered two digits: */ - /* assume 2000's if value less than 80 */ - /* assume 1900's if value greater or equal 80 */ - if (d.wYear <= 99) - { - if (d.wYear >= 80) - d.wYear = 1900 + d.wYear; - else - d.wYear = 2000 + d.wYear; - } - - leap = (!(d.wYear % 4) && (d.wYear % 100)) || !(d.wYear % 400); - - if ((d.wMonth >= 1 && d.wMonth <= 12) && - (d.wDay >= 1 && d.wDay <= awMonths[leap][d.wMonth]) && - (d.wYear >= 1980 && d.wYear <= 2099)) - { - SetLocalTime (&d); - return TRUE; - } - - return FALSE; + SYSTEMTIME d; + unsigned char leap; + LPTSTR p = s; + + if (!*s) + return TRUE; + + GetLocalTime (&d); + + d.wYear = 0; + d.wDay = 0; + d.wMonth = 0; + + switch (nDateFormat) + { + case 0: /* mmddyy */ + default: + if (!ReadNumber (&p, &d.wMonth)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wDay)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wYear)) + return FALSE; + break; + + case 1: /* ddmmyy */ + if (!ReadNumber (&p, &d.wDay)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wMonth)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wYear)) + return FALSE; + break; + + case 2: /* yymmdd */ + if (!ReadNumber (&p, &d.wYear)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wMonth)) + return FALSE; + if (!ReadSeparator (&p)) + return FALSE; + if (!ReadNumber (&p, &d.wDay)) + return FALSE; + break; + } + + /* if only entered two digits: */ + /* assume 2000's if value less than 80 */ + /* assume 1900's if value greater or equal 80 */ + if (d.wYear <= 99) + { + if (d.wYear >= 80) + d.wYear = 1900 + d.wYear; + else + d.wYear = 2000 + d.wYear; + } + + leap = (!(d.wYear % 4) && (d.wYear % 100)) || !(d.wYear % 400); + + if ((d.wMonth >= 1 && d.wMonth <= 12) && + (d.wDay >= 1 && d.wDay <= awMonths[leap][d.wMonth]) && + (d.wYear >= 1980 && d.wYear <= 2099)) + { + SetLocalTime (&d); + return TRUE; + } + + return FALSE; } INT cmd_date (LPTSTR param) { - LPTSTR *arg; - INT argc; - INT i; - BOOL bPrompt = TRUE; - INT nDateString = -1; - - if (!_tcsncmp (param, _T("/?"), 2)) - { - ConOutResPaging(TRUE,STRING_DATE_HELP4); - return 0; - } - - nErrorLevel = 0; - - /* build parameter array */ - arg = split (param, &argc, FALSE, FALSE); - - /* check for options */ - for (i = 0; i < argc; i++) - { - if (_tcsicmp (arg[i], _T("/t")) == 0) - bPrompt = FALSE; - if ((*arg[i] != _T('/')) && (nDateString == -1)) - nDateString = i; - } - - if (nDateString == -1) - ConOutPrintf(_T("%s"), GetDateString()); - - if (!bPrompt) - { - freep (arg); - return 0; - } - - if (nDateString == -1) - { - while (TRUE) /* forever loop */ - { - TCHAR s[40]; - - PrintDateString (); - ConInString (s, 40); - TRACE ("\'%s\'\n", debugstr_aw(s)); - while (*s && s[_tcslen (s) - 1] < _T(' ')) - s[_tcslen (s) - 1] = _T('\0'); - if (ParseDate (s)) - { - freep (arg); - return 0; - } - ConErrResPuts(STRING_DATE_ERROR); - - } - } - else - { - if (!ParseDate (arg[nDateString])) - { - while (TRUE) /* forever loop */ - { - TCHAR s[40]; - ConErrResPuts(STRING_DATE_ERROR); - - PrintDateString (); - ConInString (s, 40); - - while (*s && s[_tcslen (s) - 1] < _T(' ')) - s[_tcslen (s) - 1] = _T('\0'); - if (ParseDate (s)) - { - freep (arg); - return 0; - } - } - } - } - - freep (arg); - - return 0; + LPTSTR *arg; + INT argc; + INT i; + BOOL bPrompt = TRUE; + INT nDateString = -1; + + if (!_tcsncmp (param, _T("/?"), 2)) + { + ConOutResPaging(TRUE,STRING_DATE_HELP4); + return 0; + } + + nErrorLevel = 0; + + /* build parameter array */ + arg = split (param, &argc, FALSE, FALSE); + + /* check for options */ + for (i = 0; i < argc; i++) + { + if (_tcsicmp (arg[i], _T("/t")) == 0) + bPrompt = FALSE; + if ((*arg[i] != _T('/')) && (nDateString == -1)) + nDateString = i; + } + + if (nDateString == -1) + ConOutPrintf(_T("%s"), GetDateString()); + + if (!bPrompt) + { + freep (arg); + return 0; + } + + if (nDateString == -1) + { + while (TRUE) /* forever loop */ + { + TCHAR s[40]; + + PrintDateString (); + ConInString (s, 40); + TRACE ("\'%s\'\n", debugstr_aw(s)); + while (*s && s[_tcslen (s) - 1] < _T(' ')) + s[_tcslen (s) - 1] = _T('\0'); + if (ParseDate (s)) + { + freep (arg); + return 0; + } + ConErrResPuts(STRING_DATE_ERROR); + } + } + else + { + if (!ParseDate (arg[nDateString])) + { + while (TRUE) /* forever loop */ + { + TCHAR s[40]; + ConErrResPuts(STRING_DATE_ERROR); + + PrintDateString (); + ConInString (s, 40); + + while (*s && s[_tcslen (s) - 1] < _T(' ')) + s[_tcslen (s) - 1] = _T('\0'); + if (ParseDate (s)) + { + freep (arg); + return 0; + } + } + } + } + + freep (arg); + return 0; } #endif /* INCLUDE_CMD_DATE */ Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sun Jun 30 12:38:11 2013 @@ -1048,32 +1048,32 @@ * The function that prints in bare format */ static VOID -DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The number of files */ - LPTSTR lpCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ -{ - DWORD i; - - for (i = 0; i < dwCount && !bCtrlBreak; i++) - { - if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || - (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) - { - /* at bare format we don't print "." and ".." folder */ - continue; - } - if (lpFlags->bRecursive) - { - /* at recursive mode we print full path of file */ - DirPrintf(lpFlags, _T("%s\\%s\n"), lpCurPath, ptrFiles[i]->cFileName); - } - else - { - /* if we are not in recursive mode we print the file names */ - DirPrintf(lpFlags, _T("%s\n"), ptrFiles[i]->cFileName); - } - } +DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ + DWORD dwCount, /* [IN] The number of files */ + LPTSTR lpCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ +{ + DWORD i; + + for (i = 0; i < dwCount && !bCtrlBreak; i++) + { + if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || + (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) + { + /* at bare format we don't print "." and ".." folder */ + continue; + } + if (lpFlags->bRecursive) + { + /* at recursive mode we print full path of file */ + DirPrintf(lpFlags, _T("%s\\%s\n"), lpCurPath, ptrFiles[i]->cFileName); + } + else + { + /* if we are not in recursive mode we print the file names */ + DirPrintf(lpFlags, _T("%s\n"), ptrFiles[i]->cFileName); + } + } } @@ -1083,57 +1083,55 @@ * The functions that prints the files list */ static VOID -DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ - - /* Print trailing backslash for root directory of drive */ - _tcscpy(szTemp, szCurPath); - if (_tcslen(szTemp) == 2 && szTemp[1] == _T(':')) - _tcscat(szTemp, _T("\\")); - - /* Condition to print header: - We are not printing in bare format - and if we are in recursive mode... we must have results */ - if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) - { - LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); - if (DirPrintf(lpFlags, szMsg, szTemp)) - return; - } - - if (lpFlags->bBareFormat) - { - /* Bare format */ - DirPrintBareList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else if(lpFlags->bShortName) - { - /* New list style / Short names */ - DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else if(lpFlags->bWideListColSort || lpFlags->bWideList) - { - /* Wide list */ - DirPrintWideList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else if (lpFlags->bNewLongList ) - { - /* New list style*/ - DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); - } - else - { - /* If nothing is selected old list is the default */ - DirPrintOldList(ptrFiles, dwCount, szCurPath, lpFlags); - } -} - - +DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ + DWORD dwCount, /* [IN] The quantity of files */ + TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ + + /* Print trailing backslash for root directory of drive */ + _tcscpy(szTemp, szCurPath); + if (_tcslen(szTemp) == 2 && szTemp[1] == _T(':')) + _tcscat(szTemp, _T("\\")); + + /* Condition to print header: + We are not printing in bare format + and if we are in recursive mode... we must have results */ + if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) + { + LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE); + if (DirPrintf(lpFlags, szMsg, szTemp)) + return; + } + + if (lpFlags->bBareFormat) + { + /* Bare format */ + DirPrintBareList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else if(lpFlags->bShortName) + { + /* New list style / Short names */ + DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else if(lpFlags->bWideListColSort || lpFlags->bWideList) + { + /* Wide list */ + DirPrintWideList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else if (lpFlags->bNewLongList ) + { + /* New list style*/ + DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); + } + else + { + /* If nothing is selected old list is the default */ + DirPrintOldList(ptrFiles, dwCount, szCurPath, lpFlags); + } +} /* * CompareFiles @@ -1141,99 +1139,99 @@ * Compares 2 files based on the order criteria */ static BOOL -CompareFiles(LPWIN32_FIND_DATA lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ - LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ +CompareFiles(LPWIN32_FIND_DATA lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ + LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ { ULARGE_INTEGER u64File1; ULARGE_INTEGER u64File2; int i; - long iComp = 0; /* The comparison result */ - - /* Calculate critiries by order given from user */ - for (i = 0;i < lpFlags->stOrderBy.sCriteriaCount;i++) - { - - /* Calculate criteria */ - switch(lpFlags->stOrderBy.eCriteria[i]) - { - case ORDER_SIZE: /* Order by size /o:s */ - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->nFileSizeLow; - u64File1.HighPart = lpFile1->nFileSizeHigh; - u64File2.LowPart = lpFile2->nFileSizeLow; - u64File2.HighPart = lpFile2->nFileSizeHigh; - - /* In case that differnce is too big for a long */ - if (u64File1.QuadPart < u64File2.QuadPart) - iComp = -1; - else if (u64File1.QuadPart > u64File2.QuadPart) - iComp = 1; - else - iComp = 0; - break; - - case ORDER_DIRECTORY: /* Order by directory attribute /o:g */ - iComp = ((lpFile2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)- - (lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); - break; - - case ORDER_EXTENSION: /* Order by extension name /o:e */ - iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); - break; - - case ORDER_NAME: /* Order by filename /o:n */ - iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName); - break; - - case ORDER_TIME: /* Order by file's time /o:t */ - /* We compare files based on the time field selected by /t */ - switch(lpFlags->stTimeField.eTimeField) - { - case TF_CREATIONDATE: - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftCreationTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftCreationTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftCreationTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftCreationTime.dwHighDateTime ; - break; - case TF_LASTACCESSEDDATE : - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftLastAccessTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftLastAccessTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftLastAccessTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftLastAccessTime.dwHighDateTime ; - break; - case TF_MODIFIEDDATE: - /* concat the 32bit integers to a 64bit */ - u64File1.LowPart = lpFile1->ftLastWriteTime.dwLowDateTime; - u64File1.HighPart = lpFile1->ftLastWriteTime.dwHighDateTime ; - u64File2.LowPart = lpFile2->ftLastWriteTime.dwLowDateTime; - u64File2.HighPart = lpFile2->ftLastWriteTime.dwHighDateTime ; - break; - } - - /* In case that differnce is too big for a long */ - if (u64File1.QuadPart < u64File2.QuadPart) - iComp = -1; - else if (u64File1.QuadPart > u64File2.QuadPart) - iComp = 1; - else - iComp = 0; - break; - } - - /* Reverse if desired */ - if (lpFlags->stOrderBy.bCriteriaRev[i]) - iComp *= -1; - - /* If that criteria was enough for distinguishing - the files/dirs,there is no need to calculate the others*/ - if (iComp != 0) break; - } - - /* Translate the value of iComp to boolean */ - return iComp > 0; + long iComp = 0; /* The comparison result */ + + /* Calculate critiries by order given from user */ + for (i = 0;i < lpFlags->stOrderBy.sCriteriaCount;i++) + { + + /* Calculate criteria */ + switch(lpFlags->stOrderBy.eCriteria[i]) + { + case ORDER_SIZE: /* Order by size /o:s */ + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->nFileSizeLow; + u64File1.HighPart = lpFile1->nFileSizeHigh; + u64File2.LowPart = lpFile2->nFileSizeLow; + u64File2.HighPart = lpFile2->nFileSizeHigh; + + /* In case that differnce is too big for a long */ + if (u64File1.QuadPart < u64File2.QuadPart) + iComp = -1; + else if (u64File1.QuadPart > u64File2.QuadPart) + iComp = 1; + else + iComp = 0; + break; + + case ORDER_DIRECTORY: /* Order by directory attribute /o:g */ + iComp = ((lpFile2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)- + (lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); + break; + + case ORDER_EXTENSION: /* Order by extension name /o:e */ + iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); + break; + + case ORDER_NAME: /* Order by filename /o:n */ + iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName); + break; + + case ORDER_TIME: /* Order by file's time /o:t */ + /* We compare files based on the time field selected by /t */ + switch(lpFlags->stTimeField.eTimeField) + { + case TF_CREATIONDATE: + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->ftCreationTime.dwLowDateTime; + u64File1.HighPart = lpFile1->ftCreationTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->ftCreationTime.dwLowDateTime; + u64File2.HighPart = lpFile2->ftCreationTime.dwHighDateTime ; + break; + case TF_LASTACCESSEDDATE : + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->ftLastAccessTime.dwLowDateTime; + u64File1.HighPart = lpFile1->ftLastAccessTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->ftLastAccessTime.dwLowDateTime; + u64File2.HighPart = lpFile2->ftLastAccessTime.dwHighDateTime ; + break; + case TF_MODIFIEDDATE: + /* concat the 32bit integers to a 64bit */ + u64File1.LowPart = lpFile1->ftLastWriteTime.dwLowDateTime; + u64File1.HighPart = lpFile1->ftLastWriteTime.dwHighDateTime ; + u64File2.LowPart = lpFile2->ftLastWriteTime.dwLowDateTime; + u64File2.HighPart = lpFile2->ftLastWriteTime.dwHighDateTime ; + break; + } + + /* In case that differnce is too big for a long */ + if (u64File1.QuadPart < u64File2.QuadPart) + iComp = -1; + else if (u64File1.QuadPart > u64File2.QuadPart) + iComp = 1; + else + iComp = 0; + break; + } + + /* Reverse if desired */ + if (lpFlags->stOrderBy.bCriteriaRev[i]) + iComp *= -1; + + /* If that criteria was enough for distinguishing + the files/dirs,there is no need to calculate the others*/ + if (iComp != 0) break; + } + + /* Translate the value of iComp to boolean */ + return iComp > 0; } /* @@ -1242,44 +1240,42 @@ * Sort files by the order criterias using quicksort method */ static VOID -QsortFiles(LPWIN32_FIND_DATA ptrArray[], /* [IN/OUT] The array with file info pointers */ - int i, /* [IN] The index of first item in array */ - int j, /* [IN] The index to last item in array */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we will use to sort */ -{ - LPWIN32_FIND_DATA lpTemp; /* A temporary pointer */ - BOOL Way; - - if (i < j) - { - int First = i, Last = j, Temp; - Way = TRUE; - while (i != j) - { - if (Way == CompareFiles(ptrArray[i], ptrArray[j], lpFlags)) - { - /* Swap the pointers of the array */ - lpTemp = ptrArray[i]; - ptrArray[i]= ptrArray[j]; - ptrArray[j] = lpTemp; - - /* Swap the indexes for inverting sorting */ - Temp = i; - i = j; - j =Temp; - - Way = !Way; - } - - j += (!Way - Way); - } - - QsortFiles(ptrArray,First, i-1, lpFlags); - QsortFiles(ptrArray,i+1,Last, lpFlags); - } -} - - +QsortFiles(LPWIN32_FIND_DATA ptrArray[], /* [IN/OUT] The array with file info pointers */ + int i, /* [IN] The index of first item in array */ + int j, /* [IN] The index to last item in array */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we will use to sort */ +{ + LPWIN32_FIND_DATA lpTemp; /* A temporary pointer */ + BOOL Way; + + if (i < j) + { + int First = i, Last = j, Temp; + Way = TRUE; + while (i != j) + { + if (Way == CompareFiles(ptrArray[i], ptrArray[j], lpFlags)) + { + /* Swap the pointers of the array */ + lpTemp = ptrArray[i]; + ptrArray[i]= ptrArray[j]; + ptrArray[j] = lpTemp; + + /* Swap the indexes for inverting sorting */ + Temp = i; + i = j; + j =Temp; + + Way = !Way; + } + + j += (!Way - Way); + } + + QsortFiles(ptrArray,First, i-1, lpFlags); + QsortFiles(ptrArray,i+1,Last, lpFlags); + } +} /* * DirList @@ -1287,244 +1283,243 @@ * The functions that does everything except for printing results */ static INT -DirList(LPTSTR szPath, /* [IN] The path that dir starts */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ -{ - BOOL fPoint; /* If szPath is a file with extension fPoint will be True*/ - HANDLE hSearch; /* The handle of the search */ - HANDLE hRecSearch; /* The handle for searching recursivly */ - WIN32_FIND_DATA wfdFileInfo; /* The info of file that found */ - LPWIN32_FIND_DATA * ptrFileArray; /* An array of pointers with all the files */ - PDIRFINDLISTNODE ptrStartNode; /* The pointer to the first node */ - PDIRFINDLISTNODE ptrNextNode; /* A pointer used for relatives refernces */ - TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing \ */ - TCHAR szSubPath[MAX_PATH]; - LPTSTR pszFilePart; - DWORD dwCount; /* A counter of files found in directory */ - DWORD dwCountFiles; /* Counter for files */ - DWORD dwCountDirs; /* Counter for directories */ - ULONGLONG u64CountBytes; /* Counter for bytes */ - ULARGE_INTEGER u64Temp; /* A temporary counter */ - - /* Initialize Variables */ - ptrStartNode = NULL; - ptrNextNode = NULL; - dwCount = 0; - dwCountFiles = 0; - dwCountDirs = 0; - u64CountBytes = 0; - fPoint= FALSE; - - /* Create szFullPath */ - if (GetFullPathName(szPath, sizeof(szFullPath) / sizeof(TCHAR), szFullPath, &pszFilePart) == 0) - { - _tcscpy (szFullPath, szPath); - pszFilePart = NULL; - } - - /* If no wildcard or file was specified and this is a directory, then - display all files in it */ - if (pszFilePart == NULL || IsExistingDirectory(szFullPath)) - { - pszFilePart = &szFullPath[_tcslen(szFullPath)]; - if (pszFilePart[-1] != _T('\\')) - *pszFilePart++ = _T('\\'); - _tcscpy(pszFilePart, _T("*")); - } - - /* Prepare the linked list, first node is allocated */ - ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); - if (ptrStartNode == NULL) - { - WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); - return 1; /* Error cannot allocate memory for 1st object */ - } - ptrNextNode = ptrStartNode; - - /*Checking ir szPath is a File with/wout extension*/ - if (szPath[_tcslen(szPath) - 1] == _T('.')) - fPoint= TRUE; - - /* Collect the results for the current folder */ - hSearch = FindFirstFile(szFullPath, &wfdFileInfo); - if (hSearch != INVALID_HANDLE_VALUE) - { - do - { - /*If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName*/ - if(_tcschr(wfdFileInfo.cFileName,_T('.'))&&(fPoint==TRUE)) - { - continue; - /* Here we filter all the specified attributes */ - }else if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask ) - == (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal )) - { - ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE)); - if (ptrNextNode->ptrNext == NULL) - { - WARN("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n"); - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; - } - FindClose(hSearch); - return 1; - } - - /* If cmd_alloc fails we go to next file in hope it works, - without braking the linked list! */ - if (ptrNextNode->ptrNext) - { - /* Copy the info of search at linked list */ - memcpy(&ptrNextNode->ptrNext->stFindInfo, - &wfdFileInfo, - sizeof(WIN32_FIND_DATA)); - - /* If lower case is selected do it here */ - if (lpFlags->bLowerCase) - { - _tcslwr(ptrNextNode->ptrNext->stFindInfo.cAlternateFileName); - _tcslwr(ptrNextNode->ptrNext->stFindInfo.cFileName); - } - - /* Continue at next node at linked list */ - ptrNextNode = ptrNextNode->ptrNext; - dwCount ++; - - /* Grab statistics */ - if (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - /* Directory */ - dwCountDirs++; - } - else - { - /* File */ - dwCountFiles++; - u64Temp.HighPart = wfdFileInfo.nFileSizeHigh; - u64Temp.LowPart = wfdFileInfo.nFileSizeLow; - u64CountBytes += u64Temp.QuadPart; - } - } - } - } while (FindNextFile(hSearch, &wfdFileInfo)); - FindClose(hSearch); - } - - /* Terminate list */ - ptrNextNode->ptrNext = NULL; - - /* Calculate and allocate space need for making an array of pointers */ - ptrFileArray = cmd_alloc(sizeof(LPWIN32_FIND_DATA) * dwCount); - if (ptrFileArray == NULL) - { - WARN("DEBUG: Cannot allocate memory for ptrFileArray!\n"); - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; - } - return 1; - } - - /* - * Create an array of pointers from the linked list - * this will be used to sort and print data, rather than the list - */ - ptrNextNode = ptrStartNode; - dwCount = 0; - while (ptrNextNode->ptrNext) - { - *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stFindInfo; - ptrNextNode = ptrNextNode->ptrNext; - dwCount++; - } - - /* Sort Data if requested*/ - if (lpFlags->stOrderBy.sCriteriaCount > 0) - QsortFiles(ptrFileArray, 0, dwCount-1, lpFlags); - - /* Print Data */ - pszFilePart[-1] = _T('\0'); /* truncate to directory name only */ - DirPrintFiles(ptrFileArray, dwCount, szFullPath, lpFlags); - pszFilePart[-1] = _T('\\'); - - if (lpFlags->bRecursive) - { - PrintSummary(szFullPath, - dwCountFiles, - dwCountDirs, - u64CountBytes, - lpFlags, - FALSE); - } - - /* Free array */ - cmd_free(ptrFileArray); - /* Free linked list */ - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; - } - - if (CheckCtrlBreak(BREAK_INPUT)) - return 1; - - - /* Add statistics to recursive statistics*/ - recurse_dir_cnt += dwCountDirs; - recurse_file_cnt += dwCountFiles; - recurse_bytes += u64CountBytes; - - /* Do the recursive job if requested - the recursive is be done on ALL(indepent of their attribs) - directoried of the current one.*/ - if (lpFlags->bRecursive) - { - /* The new search is involving any *.* file */ - memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); - _tcscpy(&szSubPath[pszFilePart - szFullPath], _T("*.*")); - - hRecSearch = FindFirstFile (szSubPath, &wfdFileInfo); - if (hRecSearch != INVALID_HANDLE_VALUE) - { - do - { - /* We search for directories other than "." and ".." */ - if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0) && - (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0 ) && - (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - { - /* Concat the path and the directory to do recursive */ - memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); - _tcscpy(&szSubPath[pszFilePart - szFullPath], wfdFileInfo.cFileName); - _tcscat(szSubPath, _T("\\")); - _tcscat(szSubPath, pszFilePart); - - /* We do the same for the folder */ - if (DirList(szSubPath, lpFlags) != 0) - { - FindClose(hRecSearch); - return 1; - } - } - } while(FindNextFile(hRecSearch, &wfdFileInfo)); - } - FindClose(hRecSearch); - } - - return 0; -} - - +DirList(LPTSTR szPath, /* [IN] The path that dir starts */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ +{ + BOOL fPoint; /* If szPath is a file with extension fPoint will be True*/ + HANDLE hSearch; /* The handle of the search */ + HANDLE hRecSearch; /* The handle for searching recursivly */ + WIN32_FIND_DATA wfdFileInfo; /* The info of file that found */ + LPWIN32_FIND_DATA * ptrFileArray; /* An array of pointers with all the files */ + PDIRFINDLISTNODE ptrStartNode; /* The pointer to the first node */ + PDIRFINDLISTNODE ptrNextNode; /* A pointer used for relatives refernces */ + TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing \ */ + TCHAR szSubPath[MAX_PATH]; + LPTSTR pszFilePart; + DWORD dwCount; /* A counter of files found in directory */ + DWORD dwCountFiles; /* Counter for files */ + DWORD dwCountDirs; /* Counter for directories */ + ULONGLONG u64CountBytes; /* Counter for bytes */ + ULARGE_INTEGER u64Temp; /* A temporary counter */ + + /* Initialize Variables */ + ptrStartNode = NULL; + ptrNextNode = NULL; + dwCount = 0; + dwCountFiles = 0; + dwCountDirs = 0; + u64CountBytes = 0; + fPoint= FALSE; + + /* Create szFullPath */ + if (GetFullPathName(szPath, sizeof(szFullPath) / sizeof(TCHAR), szFullPath, &pszFilePart) == 0) + { + _tcscpy (szFullPath, szPath); + pszFilePart = NULL; + } + + /* If no wildcard or file was specified and this is a directory, then + display all files in it */ + if (pszFilePart == NULL || IsExistingDirectory(szFullPath)) + { + pszFilePart = &szFullPath[_tcslen(szFullPath)]; + if (pszFilePart[-1] != _T('\\')) + *pszFilePart++ = _T('\\'); + _tcscpy(pszFilePart, _T("*")); + } + + /* Prepare the linked list, first node is allocated */ + ptrStartNode = cmd_alloc(sizeof(DIRFINDLISTNODE)); + if (ptrStartNode == NULL) + { + WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); + return 1; /* Error cannot allocate memory for 1st object */ + } + ptrNextNode = ptrStartNode; + + /*Checking ir szPath is a File with/wout extension*/ + if (szPath[_tcslen(szPath) - 1] == _T('.')) + fPoint= TRUE; + + /* Collect the results for the current folder */ + hSearch = FindFirstFile(szFullPath, &wfdFileInfo); + if (hSearch != INVALID_HANDLE_VALUE) + { + do + { + /*If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName*/ + if(_tcschr(wfdFileInfo.cFileName,_T('.'))&&(fPoint==TRUE)) + { + continue; + /* Here we filter all the specified attributes */ + } + else if ((wfdFileInfo.dwFileAttributes & lpFlags->stAttribs.dwAttribMask ) + == (lpFlags->stAttribs.dwAttribMask & lpFlags->stAttribs.dwAttribVal )) + { + ptrNextNode->ptrNext = cmd_alloc(sizeof(DIRFINDLISTNODE)); + if (ptrNextNode->ptrNext == NULL) + { + WARN("DEBUG: Cannot allocate memory for ptrNextNode->ptrNext!\n"); + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount--; + } + FindClose(hSearch); + return 1; + } + + /* If cmd_alloc fails we go to next file in hope it works, + without braking the linked list! */ + if (ptrNextNode->ptrNext) + { + /* Copy the info of search at linked list */ + memcpy(&ptrNextNode->ptrNext->stFindInfo, + &wfdFileInfo, + sizeof(WIN32_FIND_DATA)); + + /* If lower case is selected do it here */ + if (lpFlags->bLowerCase) + { + _tcslwr(ptrNextNode->ptrNext->stFindInfo.cAlternateFileName); + _tcslwr(ptrNextNode->ptrNext->stFindInfo.cFileName); + } + + /* Continue at next node at linked list */ + ptrNextNode = ptrNextNode->ptrNext; + dwCount ++; + + /* Grab statistics */ + if (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + /* Directory */ + dwCountDirs++; + } + else + { + /* File */ + dwCountFiles++; + u64Temp.HighPart = wfdFileInfo.nFileSizeHigh; + u64Temp.LowPart = wfdFileInfo.nFileSizeLow; + u64CountBytes += u64Temp.QuadPart; + } + } + } + } while (FindNextFile(hSearch, &wfdFileInfo)); + FindClose(hSearch); + } + + /* Terminate list */ + ptrNextNode->ptrNext = NULL; + + /* Calculate and allocate space need for making an array of pointers */ + ptrFileArray = cmd_alloc(sizeof(LPWIN32_FIND_DATA) * dwCount); + if (ptrFileArray == NULL) + { + WARN("DEBUG: Cannot allocate memory for ptrFileArray!\n"); + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount --; + } + return 1; + } + + /* + * Create an array of pointers from the linked list + * this will be used to sort and print data, rather than the list + */ + ptrNextNode = ptrStartNode; + dwCount = 0; + while (ptrNextNode->ptrNext) + { + *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stFindInfo; + ptrNextNode = ptrNextNode->ptrNext; + dwCount++; + } + + /* Sort Data if requested*/ + if (lpFlags->stOrderBy.sCriteriaCount > 0) + QsortFiles(ptrFileArray, 0, dwCount-1, lpFlags); + + /* Print Data */ + pszFilePart[-1] = _T('\0'); /* truncate to directory name only */ + DirPrintFiles(ptrFileArray, dwCount, szFullPath, lpFlags); + pszFilePart[-1] = _T('\\'); + + if (lpFlags->bRecursive) + { + PrintSummary(szFullPath, + dwCountFiles, + dwCountDirs, + u64CountBytes, + lpFlags, + FALSE); + } + + /* Free array */ + cmd_free(ptrFileArray); + /* Free linked list */ + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount --; + } + + if (CheckCtrlBreak(BREAK_INPUT)) + return 1; + + + /* Add statistics to recursive statistics*/ + recurse_dir_cnt += dwCountDirs; + recurse_file_cnt += dwCountFiles; + recurse_bytes += u64CountBytes; + + /* Do the recursive job if requested + the recursive is be done on ALL(indepent of their attribs) + directoried of the current one.*/ + if (lpFlags->bRecursive) + { + /* The new search is involving any *.* file */ + memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); + _tcscpy(&szSubPath[pszFilePart - szFullPath], _T("*.*")); + + hRecSearch = FindFirstFile (szSubPath, &wfdFileInfo); + if (hRecSearch != INVALID_HANDLE_VALUE) + { + do + { + /* We search for directories other than "." and ".." */ + if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0) && + (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0 ) && + (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + /* Concat the path and the directory to do recursive */ + memcpy(szSubPath, szFullPath, (pszFilePart - szFullPath) * sizeof(TCHAR)); + _tcscpy(&szSubPath[pszFilePart - szFullPath], wfdFileInfo.cFileName); + _tcscat(szSubPath, _T("\\")); + _tcscat(szSubPath, pszFilePart); + + /* We do the same for the folder */ + if (DirList(szSubPath, lpFlags) != 0) + { + FindClose(hRecSearch); + return 1; + } + } + } while(FindNextFile(hRecSearch, &wfdFileInfo)); + } + FindClose(hRecSearch); + } + + return 0; +} /* * dir @@ -1534,147 +1529,155 @@ INT CommandDir(LPTSTR rest) { - TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ - TCHAR path[MAX_PATH]; - TCHAR prev_volume[MAX_PATH]; - LPTSTR* params = NULL; - LPTSTR pszFilePart; - INT entries = 0; - UINT loop = 0; - DIRSWITCHFLAGS stFlags; - INT ret = 1; - BOOL ChangedVolume; - - /* Initialize Switch Flags < Default switches are setted here!> */ - stFlags.b4Digit = TRUE; - stFlags.bBareFormat = FALSE; - stFlags.bLowerCase = FALSE; - stFlags.bNewLongList = TRUE; - stFlags.bPause = FALSE; - stFlags.bRecursive = FALSE; - stFlags.bShortName = FALSE; - stFlags.bTSeperator = TRUE; - stFlags.bUser = FALSE; - stFlags.bWideList = FALSE; - stFlags.bWideListColSort = FALSE; - stFlags.stTimeField.eTimeField = TF_MODIFIEDDATE; - stFlags.stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; - stFlags.stAttribs.dwAttribVal = 0L; - stFlags.stOrderBy.sCriteriaCount = 0; - - nErrorLevel = 0; - - /* read the parameters from the DIRCMD environment variable */ - if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) - if (!DirReadParam(dircmd, &params, &entries, &stFlags)) - { - nErrorLevel = 1; - goto cleanup; - } - - /* read the parameters */ - if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) - { - nErrorLevel = 1; - goto cleanup; - } - - /* default to current directory */ - if(entries == 0) { - if(!add_entry(&entries, &params, _T("*"))) { - nErrorLevel = 1; - goto cleanup; - } - } - - prev_volume[0] = _T('\0'); - - /* Reset paging state */ - if (stFlags.bPause) - ConOutPrintfPaging(TRUE, _T("")); - - for(loop = 0; loop < (UINT)entries; loop++) - { - if (CheckCtrlBreak(BREAK_INPUT)) - { - nErrorLevel = 1; - goto cleanup; - } - - recurse_dir_cnt = 0L; - recurse_file_cnt = 0L; - recurse_bytes = 0; - - /* <Debug :> - Uncomment this to show the final state of switch flags*/ - { - int i; - TRACE("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); - TRACE("(B) Bare format : %i\n", stFlags.bBareFormat ); - TRACE("(C) Thousand : %i\n", stFlags.bTSeperator ); - TRACE("(W) Wide list : %i\n", stFlags.bWideList ); - TRACE("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort ); - TRACE("(L) Lowercase : %i\n", stFlags.bLowerCase ); - TRACE("(N) New : %i\n", stFlags.bNewLongList ); - TRACE("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); - for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) - TRACE(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); - TRACE("(P) Pause : %i\n", stFlags.bPause ); - TRACE("(Q) Owner : %i\n", stFlags.bUser ); - TRACE("(S) Recursive : %i\n", stFlags.bRecursive ); - TRACE("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); - TRACE("(X) Short names : %i\n", stFlags.bShortName ); - TRACE("Parameter : %s\n", debugstr_aw(params[loop]) ); - } - - /* Print the drive header if the volume changed */ - ChangedVolume = TRUE; - - if (!stFlags.bBareFormat && - GetVolumePathName(params[loop], path, sizeof(path) / sizeof(TCHAR))) - { - if (!_tcscmp(path, prev_volume)) - ChangedVolume = FALSE; - else - _tcscpy(prev_volume, path); - } - else if (GetFullPathName(params[loop], sizeof(path) / sizeof(TCHAR), path, &pszFilePart) != 0) - { - if (pszFilePart != NULL) - *pszFilePart = _T('\0'); - } - else - _tcscpy(path, params[loop]); - - if (ChangedVolume && !stFlags.bBareFormat) { - if (!PrintDirectoryHeader (params[loop], &stFlags)) { - nErrorLevel = 1; - goto cleanup; - } - } - - /* do the actual dir */ - if (DirList (params[loop], &stFlags)) - { - nErrorLevel = 1; - goto cleanup; - } - - /* print the footer */ - PrintSummary(path, - recurse_file_cnt, - recurse_dir_cnt, - recurse_bytes, - &stFlags, - TRUE); - } - - ret = 0; + TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ + TCHAR path[MAX_PATH]; + TCHAR prev_volume[MAX_PATH]; + LPTSTR* params = NULL; + LPTSTR pszFilePart; + INT entries = 0; + UINT loop = 0; + DIRSWITCHFLAGS stFlags; + INT ret = 1; + BOOL ChangedVolume; + + /* Initialize Switch Flags < Default switches are setted here!> */ + stFlags.b4Digit = TRUE; + stFlags.bBareFormat = FALSE; + stFlags.bLowerCase = FALSE; + stFlags.bNewLongList = TRUE; + stFlags.bPause = FALSE; + stFlags.bRecursive = FALSE; + stFlags.bShortName = FALSE; + stFlags.bTSeperator = TRUE; + stFlags.bUser = FALSE; + stFlags.bWideList = FALSE; + stFlags.bWideListColSort = FALSE; + stFlags.stTimeField.eTimeField = TF_MODIFIEDDATE; + stFlags.stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; + stFlags.stAttribs.dwAttribVal = 0L; + stFlags.stOrderBy.sCriteriaCount = 0; + + nErrorLevel = 0; + + /* read the parameters from the DIRCMD environment variable */ + if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) + { + if (!DirReadParam(dircmd, &params, &entries, &stFlags)) + { + nErrorLevel = 1; + goto cleanup; + } + } + + /* read the parameters */ + if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) + { + nErrorLevel = 1; + goto cleanup; + } + + /* default to current directory */ + if (entries == 0) + { + if (!add_entry(&entries, &params, _T("*"))) + { + nErrorLevel = 1; + goto cleanup; + } + } + + prev_volume[0] = _T('\0'); + + /* Reset paging state */ + if (stFlags.bPause) + ConOutPrintfPaging(TRUE, _T("")); + + for(loop = 0; loop < (UINT)entries; loop++) + { + if (CheckCtrlBreak(BREAK_INPUT)) + { + nErrorLevel = 1; + goto cleanup; + } + + recurse_dir_cnt = 0L; + recurse_file_cnt = 0L; + recurse_bytes = 0; + + /* <Debug :> + Uncomment this to show the final state of switch flags*/ + { + int i; + TRACE("Attributes mask/value %x/%x\n",stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); + TRACE("(B) Bare format : %i\n", stFlags.bBareFormat ); + TRACE("(C) Thousand : %i\n", stFlags.bTSeperator ); + TRACE("(W) Wide list : %i\n", stFlags.bWideList ); + TRACE("(D) Wide list sort by column : %i\n", stFlags.bWideListColSort ); + TRACE("(L) Lowercase : %i\n", stFlags.bLowerCase ); + TRACE("(N) New : %i\n", stFlags.bNewLongList ); + TRACE("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); + for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) + TRACE(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); + TRACE("(P) Pause : %i\n", stFlags.bPause ); + TRACE("(Q) Owner : %i\n", stFlags.bUser ); + TRACE("(S) Recursive : %i\n", stFlags.bRecursive ); + TRACE("(T) Time field : %i\n", stFlags.stTimeField.eTimeField ); + TRACE("(X) Short names : %i\n", stFlags.bShortName ); + TRACE("Parameter : %s\n", debugstr_aw(params[loop]) ); + } + + /* Print the drive header if the volume changed */ + ChangedVolume = TRUE; + + if (!stFlags.bBareFormat && + GetVolumePathName(params[loop], path, sizeof(path) / sizeof(TCHAR))) + { + if (!_tcscmp(path, prev_volume)) + ChangedVolume = FALSE; + else + _tcscpy(prev_volume, path); + } + else if (GetFullPathName(params[loop], sizeof(path) / sizeof(TCHAR), path, &pszFilePart) != 0) + { + if (pszFilePart != NULL) + *pszFilePart = _T('\0'); + } + else + { + _tcscpy(path, params[loop]); + } + + if (ChangedVolume && !stFlags.bBareFormat) + { + if (!PrintDirectoryHeader (params[loop], &stFlags)) + { + nErrorLevel = 1; + goto cleanup; + } + } + + /* do the actual dir */ + if (DirList (params[loop], &stFlags)) + { + nErrorLevel = 1; + goto cleanup; + } + + /* print the footer */ + PrintSummary(path, + recurse_file_cnt, + recurse_dir_cnt, + recurse_bytes, + &stFlags, + TRUE); + } + + ret = 0; cleanup: - freep(params); - - return ret; + freep(params); + + return ret; } #endif

11 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013