X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=pc-tools%2Fldc2%2Fsrc%2Fconfig.cpp;h=5cb7043cba61799f46f4359d699a3f3de2e7b585;hb=de6b6757167b76f4c363177d66f3ac4502811b42;hp=1a10ac7722e6b860c4ac223ffe30aeee39da7a31;hpb=469fccad06f660330da12c66f0e95582f3e646a4;p=h316.git

diff --git a/pc-tools/ldc2/src/config.cpp b/pc-tools/ldc2/src/config.cpp
index 1a10ac7..5cb7043 100644
--- a/pc-tools/ldc2/src/config.cpp
+++ b/pc-tools/ldc2/src/config.cpp
@@ -28,9 +28,10 @@ int cfg_output_exported=0;
 int cfg_output_unsatisfied=0;
 int cfg_split_objects=0;
 int cfg_split_objects_numbered=0;
+int cfg_split_blocks=0;
 int cfg_ignore_block_errors=0;
 int cfg_ignore_checksum_errors=0;
-int cfg_pause_on_checksum_error=0;
+//int cfg_pause_on_checksum_error=0;
 int cfg_ignore_unknown_block_errors=0;
 int cfg_ignore_object_integrity_errors=0;
 int cfg_list_contents=1;
@@ -40,7 +41,7 @@ int cfg_quiet=0;
 int cfg_version=0;
 
 int in_fd=0;  //! File descriptor for data input 
-int out_fd=2; //! File descriptor for text output
+int out_fd=1; //! File descriptor for text output
 
 void do_config(int argc, char ** args){
 
@@ -68,14 +69,18 @@ void do_config(int argc, char ** args){
 		       "List all unsatisfied symbols.",
 		       &cfg_output_unsatisfied,true,true);
 
-  ar.add_option_switch("S","split_objects_numbered",
-		       "Split input data into distinct numbered files",
-		       &cfg_split_objects_numbered,true,true);
-
   ar.add_option_switch("s","split_objects",
 		       "Split input data into distinct object files.",
 		       &cfg_split_objects,true,true);
   
+  ar.add_option_switch("S","split_objects_numbered",
+		       "Split input data into distinct numbered files",
+		       &cfg_split_objects_numbered,true,true);
+
+  ar.add_option_switch("B","split_blocks",
+		       "Split tape into named and numbered block files",
+		       &cfg_split_blocks,true,true);
+
   ar.add_option_switch("b","ignore_block_errors",
 		       "Ignore block integrity errors. This will output broken blocks,too",
 		       &cfg_ignore_block_errors,true,true);
@@ -84,9 +89,9 @@ void do_config(int argc, char ** args){
 		       "Ignore block checksum errors. Errors will be converted to warnings.",
 		       &cfg_ignore_checksum_errors,true,true);
 
-  ar.add_option_switch("p","pause_on_checksum_error",
-		       "Wait for user input on checksum error.",
-		       &cfg_pause_on_checksum_error,true,true);
+//   ar.add_option_switch("p","pause_on_checksum_error",
+// 		       "Wait for user input on checksum error.",
+// 		       &cfg_pause_on_checksum_error,true,true);
   
   ar.add_option_switch("n","ignore_unknown_block_errors",
 		       "Ignore errors caused by unknown block types. Errors will be converted to warnings.",
@@ -196,13 +201,11 @@ Errors will be converted to warnings.",
   if (cfg_verbose)cfg_quiet=0;
 
   // The configuration implications according to /cfg007/
-  if (in_fd==0) cfg_pause_on_checksum_error=0;
-  if (cfg_pause_on_checksum_error==1) cfg_ignore_checksum_errors=1;
+  //  if (in_fd==0) cfg_pause_on_checksum_error=0;
+  // if (cfg_pause_on_checksum_error==1) cfg_ignore_checksum_errors=1;
 
   if (cfg_output_info||cfg_output_called||cfg_output_exported||
-      cfg_output_unsatisfied||
-      cfg_split_objects||cfg_split_objects_numbered)
-    cfg_list_contents=0;
+      cfg_output_unsatisfied) cfg_list_contents=0;
 }