ldc2: Cosmetic fixes and support for compiler orverride

[h316.git] / pc-tools / ldc2 / src / main.cpp

diff --git a/pc-tools/ldc2/src/main.cpp b/pc-tools/ldc2/src/main.cpp
index 35f4ce632b4d10636a6764783c6993819f914a6c..8b7da8788adc4e0753701545b23467a48f19bcd1 100644 (file)
--- a/pc-tools/ldc2/src/main.cpp
+++ b/pc-tools/ldc2/src/main.cpp
@@ -2,11 +2,25 @@
  * 
  * LDC2 source code
  *
- * $Date: 2007/03/26 03:20:31 $
+ * $Date: 2010/01/04 02:10:59 $
  * $Author: hachti $
  *
  * $Log: main.cpp,v $
- * Revision 2.2  2007/03/26 03:20:31  hachti
+ * Revision 2.6  2010/01/04 02:10:59  hachti
+ * *** empty log message ***
+ *
+ * Revision 2.5  2008-10-01 13:30:14  hachti
+ * Added some includes
+ *
+ * Revision 2.4  2008-08-25 21:02:24  hachti
+ * *** empty log message ***
+ *
+ * Revision 2.3  2007-05-30 02:51:16  hachti
+ * Changed everything towards LDC2 use.
+ * Worked on the buildlib.sh.
+ * Centralized  buildlib.sh to a new lib/common directory.
+ *
+ * Revision 2.2  2007-03-26 03:20:31  hachti
  * *** empty log message ***
  *
  * Revision 2.1  2007-03-26 01:15:21  hachti
@@ -21,6 +35,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 
 #include <vector>
 #include <string>
@@ -97,8 +116,8 @@ void read_tape(){
   
   while(read_ahead){
 
-    bool err_checksum=false;  //! Checksum error flag.
-    bool err_integrity=false; //! Integrity error flag.
+         //  bool err_checksum=false;  //! Checksum error flag.
+         //    bool err_integrity=false; //! Integrity error flag.
     
     bool warning=false;       //! Warning flag.
     bool error=false;         //! Error flag.
@@ -127,7 +146,7 @@ void read_tape(){
     
     catch(tape_block::eof_illegal_exception &e){
       block=e.get_block();
-      err_integrity=true;
+      //      err_integrity=true;
       read_ahead=false;
       if (cfg_ignore_block_errors){
        message="Warning: Block integrity check failed!\n";
@@ -141,7 +160,7 @@ void read_tape(){
     
     catch(tape_block::checksum_error_exception &e){
       block=e.get_block();
-      err_checksum=true;
+      //      err_checksum=true;
       if (cfg_ignore_checksum_errors){
        message="Warning: Block checksum wrong!\n";
        warning=true;
@@ -273,9 +292,9 @@ void process_tape(){
       
       // Open file for split objects
       if (cfg_split_objects && (block->get_type()!=tape_block::TBT_EOT)){
-       if (objname=="UNKNOWN")snprintf(filename,99,"UNKNOWN%02i.obj",
+       if (objname=="UNKNOWN")snprintf(filename,99,"UNKNOWN%02i",
                                        unknown_count);
-       else snprintf(filename,99,"%s.obj",objname.c_str());
+       else snprintf(filename,99,"%s",objname.c_str());
        if (fd>-1) close (fd);
        if (cfg_verbose) fprintf(stdwarn,"Writing file: %s\n",filename);
        fd=open(filename,O_WRONLY|O_CREAT|O_TRUNC,0666);
@@ -289,7 +308,7 @@ void process_tape(){
       }
 
       // Open file for split objects numbered
-      snprintf(filename_numbered,99,"%03i0-%s.obj",obj_no,objname.c_str());
+      snprintf(filename_numbered,99,"%03i0-%s",obj_no,objname.c_str());
       if (cfg_split_objects_numbered){
        close (fd_numbered);
        if (cfg_verbose) fprintf(stdwarn,"Writing file: %s\n",filename_numbered);