[ros-diffs] [hbelusca] 59132: [CMD] COLOR builtin command of CMD does not format output color correctly. When changing the color of the foreground of the console with the command "color 3" for instance, the co...

Author: hbelusca
Date: Sat Jun  1 18:45:04 2013
New Revision: 59132

URL: http://svn.reactos.org/svn/reactos?rev=59132&view=rev
Log:
[CMD]
COLOR builtin command of CMD does not format output color correctly.
When changing the color of the foreground of the console with the command "color
3" for instance,
the confirmation message "Color 3" appears whereas it should say "Color
03" as the number is output in 1-byte hexadecimal form.

Patch by Radek Liška

CORE-7246 #resolve #comment Committed in revision r59132. Thanks :)

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] Sat Jun  1 18:45:04 2013
@@ -633,7 +633,7 @@
 STRING_CMD_ERROR5,           "Ausführend cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Fehler: Hinter- und Vordergrund können nicht die
selben Farben haben!"
 STRING_COLOR_ERROR2,         "Fehler in der Farbangabe"
-STRING_COLOR_ERROR3,         "Farbe %x\n"
+STRING_COLOR_ERROR3,         "Farbe %02x\n"
 STRING_CONSOLE_ERROR,        "Unbekannter Fehler: %d\n"
 STRING_COPY_ERROR1,          "Fehler: Quelle kann nicht geöffnet werden -
%s!\n"
 STRING_COPY_ERROR2,          "Fehler: Kann nicht über sich selbst kopiert
werden.\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] Sat Jun  1 18:45:04 2013
@@ -633,7 +633,7 @@
 STRING_CMD_ERROR5,           "Running cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Same colors error! (Background and foreground
can't be the same color)"
 STRING_COLOR_ERROR2,         "error in color specification"
-STRING_COLOR_ERROR3,         "Color %x\n"
+STRING_COLOR_ERROR3,         "Color %02x\n"
 STRING_CONSOLE_ERROR,        "Άγνωστο σφάλμα: %d\n"
 STRING_COPY_ERROR1,          "Σφάλμα: Δεν ήταν δυνατό το άνοιγμα της πηγής - %s!\n"
 STRING_COPY_ERROR2,          "Σφάλμα: Can't copy onto itself!\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] Sat Jun  1 18:45:04 2013
@@ -636,7 +636,7 @@
 STRING_CMD_ERROR5,           "Running cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Same colors error! (Background and foreground
can't be the same color)"
 STRING_COLOR_ERROR2,         "error in color specification"
-STRING_COLOR_ERROR3,         "Color %x\n"
+STRING_COLOR_ERROR3,         "Color %02x\n"
 STRING_CONSOLE_ERROR,        "Unknown error: %d\n"
 STRING_COPY_ERROR1,          "Error: Cannot open source - %s!\n"
 STRING_COPY_ERROR2,          "Error: Can't copy onto itself!\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] Sat Jun  1 18:45:04 2013
@@ -636,7 +636,7 @@
 STRING_CMD_ERROR5,           "Ejecutando cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "¡Mismos colores! (El color de frente y de fondo no
pueden ser el mismo)"
 STRING_COLOR_ERROR2,         "Error en la especificación del color"
-STRING_COLOR_ERROR3,         "Color %x\n"
+STRING_COLOR_ERROR3,         "Color %02x\n"
 STRING_CONSOLE_ERROR,        "Error desconocido: %d\n"
 STRING_COPY_ERROR1,          "Error: No se puede abrir el origen - %s!\n"
 STRING_COPY_ERROR2,          "Error: ¡No se puede copiar sobre si mismo!\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] Sat Jun  1 18:45:04 2013
@@ -651,7 +651,7 @@
 STRING_CMD_ERROR5,           "Lance cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "L'arrière plan et l'avant plan ne peuvent
être de la même couleur"
 STRING_COLOR_ERROR2,         "Erreur dans la spécification des couleurs"
-STRING_COLOR_ERROR3,         "Couleur %x\n"
+STRING_COLOR_ERROR3,         "Couleur %02x\n"
 STRING_CONSOLE_ERROR,        "Erreur inconnue : %d\n"
 STRING_COPY_ERROR1,          "Erreur : Ne peut ouvrir la source - %s !\n"
 STRING_COPY_ERROR2,          "Erreur : Ne peut copier le fichier sur lui-même
!\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] Sat Jun  1 18:45:04 2013
@@ -615,7 +615,7 @@
 STRING_CMD_ERROR5,           "cmdexit.bat futtatása...\n"
 STRING_COLOR_ERROR1,         "Ugyanaz a szín nem lehet! (Az elõ- és háttérszín
nem lehet ugyanolyan)"
 STRING_COLOR_ERROR2,         "Hibás szín megadás"
-STRING_COLOR_ERROR3,         "Szín %x\n"
+STRING_COLOR_ERROR3,         "Szín %02x\n"
 STRING_CONSOLE_ERROR,        "Ismeretlen hiba: %d\n"
 STRING_COPY_ERROR1,          "Hiba: a forrás nem nyitható meg - %s!\n"
 STRING_COPY_ERROR2,          "Hiba: nem másolhatod önmagára az
állományt!\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] Sat Jun  1 18:45:04 2013
@@ -635,7 +635,7 @@
 STRING_CMD_ERROR5,           "Menjalankan cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Warna sama salah! (Latar belakang dan latar depan
tidak bisa berwarna sama)"
 STRING_COLOR_ERROR2,         "Kesalahan dalam spesifikasi warna"
-STRING_COLOR_ERROR3,         "Warna %x\n"
+STRING_COLOR_ERROR3,         "Warna %02x\n"
 STRING_CONSOLE_ERROR,        "Kesalahan tidak dikenal: %d\n"
 STRING_COPY_ERROR1,          "Salah: Tidak dapat membuka sumber - %s!\n"
 STRING_COPY_ERROR2,          "Salah: Tidak dapat mengcopy ke dirinya
sendiri!\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] Sat Jun  1 18:45:04 2013
@@ -641,7 +641,7 @@
 STRING_CMD_ERROR5,           "Esecuzione di cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Il colore di primo piano e sfondo non possono essere
uguali"
 STRING_COLOR_ERROR2,         "errore nella indicazione dei colori"
-STRING_COLOR_ERROR3,         "Colore %x\n"
+STRING_COLOR_ERROR3,         "Colore %02x\n"
 STRING_CONSOLE_ERROR,        "errore sconosciuto: %d\n"
 STRING_COPY_ERROR1,          "Errore: Impossibile aprire il file sorgente -
%s!\n"
 STRING_COPY_ERROR2,          "Errore: Impossibile copiare un file su se
stesso!\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] Sat Jun  1 18:45:04 2013
@@ -641,7 +641,7 @@
 STRING_CMD_ERROR5,           "cmdexit.bat を実行しています...\n"
 STRING_COLOR_ERROR1,         "エラー! 同じ色が指定されました。\n
(前景色と背景色を同じ色にすることはできません)"
 STRING_COLOR_ERROR2,         "色の指定に問題があります。"
-STRING_COLOR_ERROR3,         "Color %x\n"
+STRING_COLOR_ERROR3,         "Color %02x\n"
 STRING_CONSOLE_ERROR,        "不明なエラー: %d\n"
 STRING_COPY_ERROR1,          "エラー: 元のファイル %s を開けません!\n"
 STRING_COPY_ERROR2,          "エラー: コピー元とコピー先が一緒です!\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] Sat Jun  1 18:45:04 2013
@@ -628,7 +628,7 @@
 STRING_CMD_ERROR5,           "Kjører cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha
samme farge)"
 STRING_COLOR_ERROR2,         "feil i farge spesifikasjon"
-STRING_COLOR_ERROR3,         "Farge %x\n"
+STRING_COLOR_ERROR3,         "Farge %02x\n"
 STRING_CONSOLE_ERROR,        "Ukjent feil: %d\n"
 STRING_COPY_ERROR1,          "Feil: kan ikke åpne kilden - %s!\n"
 STRING_COPY_ERROR2,          "Feil: kan ikke kopiere til seg selv!\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] Sat Jun  1 18:45:04 2013
@@ -636,7 +636,7 @@
 STRING_CMD_ERROR5,           "Wykonywanie cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Błąd! Kolor tła i tekstu nie może być taki sam"
 STRING_COLOR_ERROR2,         "Błąd w oznaczeniu kolorów."
-STRING_COLOR_ERROR3,         "Kolor %x\n"
+STRING_COLOR_ERROR3,         "Kolor %02x\n"
 STRING_CONSOLE_ERROR,        "Nieznany błąd: %d\n"
 STRING_COPY_ERROR1,          "Błąd: Nie można otworzyć źródła - %s!\n"
 STRING_COPY_ERROR2,          "Błąd: Nie można przekopiować pliku na niego samego!\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] Sat Jun  1 18:45:04 2013
@@ -680,7 +680,7 @@
 STRING_CMD_ERROR5,           "Executare «cmdexit.bat»...\n"
 STRING_COLOR_ERROR1,         "Eroare de culoare identică! (Culorile nu trebuie să
fie identice)"
 STRING_COLOR_ERROR2,         "Eroare la specificarea culorii"
-STRING_COLOR_ERROR3,         "Culoare %x\n"
+STRING_COLOR_ERROR3,         "Culoare %02x\n"
 STRING_CONSOLE_ERROR,        "Eroare necunoscută: %d\n"
 STRING_COPY_ERROR1,          "Eroare: Nu se poate deschide fișierul -
«%s»!\n"
 STRING_COPY_ERROR2,          "Eroare: Nu se poate copia peste el însuși!\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] Sat Jun  1 18:45:04 2013
@@ -640,7 +640,7 @@
 STRING_CMD_ERROR5,           "Запуск cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Одинаковые цвета! (Цвета фона
и текста не могут быть одинаковыми)"
 STRING_COLOR_ERROR2,         "ошибка в указании цвета"
-STRING_COLOR_ERROR3,         "Цвет %x\n"
+STRING_COLOR_ERROR3,         "Цвет %02x\n"
 STRING_CONSOLE_ERROR,        "Неизвестная ошибка: %d\n"
 STRING_COPY_ERROR1,          "Ошибка: Невозможно открыть
источник - %s!\n"
 STRING_COPY_ERROR2,          "Ошибка: Невозможно
копировать в себя!\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] Sat Jun  1 18:45:04 2013
@@ -640,7 +640,7 @@
 STRING_CMD_ERROR5,           "Running cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Same colors error! (Background and foreground
can't be the same color)"
 STRING_COLOR_ERROR2,         "error in color specification"
-STRING_COLOR_ERROR3,         "Color %x\n"
+STRING_COLOR_ERROR3,         "Color %02x\n"
 STRING_CONSOLE_ERROR,        "Neznáma chyba: %d\n"
 STRING_COPY_ERROR1,          "Chyba: Cannot open source - %s!\n"
 STRING_COPY_ERROR2,          "Chyba: Can't copy onto itself!\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] Sat Jun  1 18:45:04 2013
@@ -628,7 +628,7 @@
 STRING_CMD_ERROR5,           "Kör cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "Samme farge feil! (Bakgrunn och forgrunn kan inte ha
samme farge)"
 STRING_COLOR_ERROR2,         "feil i farge spesifikasjon"
-STRING_COLOR_ERROR3,         "Farge %x\n"
+STRING_COLOR_ERROR3,         "Farge %02x\n"
 STRING_CONSOLE_ERROR,        "Ukjent feil: %d\n"
 STRING_COPY_ERROR1,          "Feil: kan inte åpne kilden - %s!\n"
 STRING_COPY_ERROR2,          "Feil: kan inte kopiere til seg selv!\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] Sat Jun  1 18:45:04 2013
@@ -642,7 +642,7 @@
 STRING_CMD_ERROR5,           "Запуск cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "помилка - однаковi кольори!
(тло та текст не можуть бути однакового
кольору)"
 STRING_COLOR_ERROR2,         "помилка при вказаннi
кольору"
-STRING_COLOR_ERROR3,         "Колiр %x\n"
+STRING_COLOR_ERROR3,         "Колiр %02x\n"
 STRING_CONSOLE_ERROR,        "Невiдома помилка: %d\n"
 STRING_COPY_ERROR1,          "Помилка: Неможливо вiдкрити
джерело - %s!\n"
 STRING_COPY_ERROR2,          "Помилка: Неможливо копiювати
в себе!\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] Sat Jun  1 18:45:04 2013
@@ -600,7 +600,7 @@
 STRING_CMD_ERROR5,           "正在运行 cmdexit.bat...\n"
 STRING_COLOR_ERROR1,         "åŒæ ·é¢œè‰²é”™è¯¯ï¼
(背景和前景不能同色)"
 STRING_COLOR_ERROR2,         "颜色指定错误"
-STRING_COLOR_ERROR3,         "颜色 %x\n"
+STRING_COLOR_ERROR3,         "颜色 %02x\n"
 STRING_CONSOLE_ERROR,        "未知错误：%d\n"
 STRING_COPY_ERROR1,          "é”™è¯¯ï¼šæ— æ³•æ‰“å¼€æº -  %s！\n"
 STRING_COPY_ERROR2,          "é”™è¯¯ï¼šæ— æ³•å¤åˆ¶åˆ°è‡ªèº«ï¼\n"