X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=pc-tools%2Fldc2%2Fsrc%2Fconfig.cpp;h=b5d3cdec94c4b9f772401678356ff2586bdf2b91;hb=HEAD;hp=1a10ac7722e6b860c4ac223ffe30aeee39da7a31;hpb=874a2bd89fd65e5a1763d88c218f066a424e0d04;p=h316.git

diff --git a/pc-tools/ldc2/src/config.cpp b/pc-tools/ldc2/src/config.cpp
index 1a10ac7..b5d3cde 100644
--- a/pc-tools/ldc2/src/config.cpp
+++ b/pc-tools/ldc2/src/config.cpp
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * 
+ * LDC2 source code
+ *
+ * $Date: 2008/10/01 13:30:14 $
+ * $Author: hachti $
+ *
+ * $Log: config.cpp,v $
+ * Revision 2.3  2008/10/01 13:30:14  hachti
+ * Added some includes
+ *
+ * Revision 2.2  2008-08-25 21:02:24  hachti
+ * *** empty log message ***
+ *
+ * Revision 2.1  2007-12-23 15:25:11  hachti
+ * *** empty log message ***
+ *
+ * Revision 2.0  2007-03-26 01:00:38  hachti
+ * *** empty log message ***
+ *
+ *
+ ******************************************************************************/
+ 
 /*
  * Program configuration management
  */
@@ -7,9 +30,11 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <stdlib.h>
 
 #include "configuration_manager.hh"
 #include "tool.hh"
@@ -28,19 +53,21 @@ 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;
 int cfg_verbose=0;
 int cfg_quiet=0;
+int cfg_dump_block_contents=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){
 
@@ -60,6 +87,10 @@ void do_config(int argc, char ** args){
 		       "Print all called symbols from the object(s).",
 		       &cfg_output_called,true,true);
 
+  ar.add_option_switch("d","dump_block_contents",
+		       "Dump block contents",
+		       &cfg_dump_block_contents,true,true);
+
   ar.add_option_switch("e","output_exported",
 		       "Print all exported symbols from the object(s).",
 		       &cfg_output_exported,true,true);
@@ -68,14 +99,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 +119,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 +231,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;
 }