[ros-diffs] [cwittich] 27975: fix no confirmation before format See issue #2498 for more details.

Author: cwittich
Date: Sun Jul 29 00:12:31 2007
New Revision: 27975

URL: http://svn.reactos.org/svn/reactos?rev=27975&view=rev
Log:
fix no confirmation before format
See issue #2498 for more details.

Modified:
    trunk/reactos/base/system/format/format.c
    trunk/reactos/base/system/format/lang/de-DE.rc

Modified: trunk/reactos/base/system/format/format.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.…
==============================================================================
--- trunk/reactos/base/system/format/format.c (original)
+++ trunk/reactos/base/system/format/format.c Sun Jul 29 00:12:31 2007
@@ -420,17 +420,15 @@
 			}
 		}
 
+		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;
 			}

Modified: trunk/reactos/base/system/format/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/de…
==============================================================================
--- trunk/reactos/base/system/format/lang/de-DE.rc (original)
+++ trunk/reactos/base/system/format/lang/de-DE.rc Sun Jul 29 00:12:31 2007
@@ -54,7 +54,7 @@
 
 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"