From c50397f0e44c63b7d146db543754d09ca478a29e Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sat, 28 Jul 2007 20:12:31 +0000
Subject: [PATCH] fix no confirmation before format See issue #2498 for more
 details.

svn path=/trunk/; revision=27975
---
 reactos/base/system/format/format.c      | 18 ++++++++----------
 reactos/base/system/format/lang/de-DE.rc |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/reactos/base/system/format/format.c b/reactos/base/system/format/format.c
index 99775e2fe83..08be602a472 100755
--- a/reactos/base/system/format/format.c
+++ b/reactos/base/system/format/format.c
@@ -420,17 +420,15 @@ _tmain(int argc, TCHAR *argv[])
 			}
 		}
 
+		LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+		_tprintf(szMsg, RootDirectory[0] );
+
+		LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
+
 		while( 1 ) {
-
-			LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
-			_tprintf(szMsg, RootDirectory[0] );
-
-			LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
-
-			if(_strnicmp(&input[0],&szMsg[0],1)) break;
-
-			if(_strnicmp(&input[0],&szMsg[1],1) ) {
-
+			_fgetts( input, sizeof(input)/2, stdin );
+			if(_strnicmp(&input[0],&szMsg[0],1) == 0) break;
+			if(_strnicmp(&input[0],&szMsg[1],1) == 0) {
 				_tprintf(_T("\n"));
 				return 0;
 			}
diff --git a/reactos/base/system/format/lang/de-DE.rc b/reactos/base/system/format/lang/de-DE.rc
index 53bce37afd7..0b32415071c 100644
--- a/reactos/base/system/format/lang/de-DE.rc
+++ b/reactos/base/system/format/lang/de-DE.rc
@@ -54,7 +54,7 @@ STRING_ERROR_LABEL     "Eine unzul
 
 STRING_YN_FORMAT       "\nACHTUNG, beim Formatieren werden ALLE Daten auf dem Datenträger %C: gelöscht!\nMit Formatierung fortfahren? (Ja/Nein)? "
 
-STRING_YES_NO_FAQ      "J/N"
+STRING_YES_NO_FAQ      "JN"
 
 STRING_VERIFYING       "Prüfen"