final fix of magic header parsing

Author: andre-simon

ChangeLog

@@ -1,5 +1,13 @@
 Ansifilter ChangeLog
 
+03.08.2017
+
+ansifilter 2.7
+
+-fixed processing of very small input files (https://github.com/andre-simon/ansifilter/issues/7)
+-added -fPIC to CXXFLAGS in src/makefile (https://github.com/andre-simon/ansifilter/issues/6)
+
+---
 25.07.2017
 
 ansifilter 2.6
@@ -145,7 +153,7 @@ ansifilter 1.9
 ansifilter 1.8
 
 -added support for Erase Line, Save and Restore Cursor sequences
-  (thanks to Kovács Zoltán)
+  (thanks to Kov�cs Zolt�n)
 
 ---
 04.01.2012

src/codegenerator.cpp

@@ -966,9 +966,10 @@ void CodeGenerator::allocateTermBuffer(){
 bool CodeGenerator::streamIsXBIN() {
   bool isXBIN = false;
   char head[5] = {0};
-  if (in!=&cin && in->read (head, 4) ) {
+  if (in!=&cin && in->read (head, sizeof head -1) ) {
     isXBIN = string(head)=="XBIN";
   }
+  in->clear();
   in->seekg (0, ios::beg);
   return isXBIN;
 }
@@ -978,9 +979,11 @@ bool CodeGenerator::streamIsTundra() {
   bool isTND = false;
   char head[10] = {0};
 
-  if (in!=&cin && in->read (head, 9) ) {
+  if (in!=&cin && in->read (head, sizeof head -1) ) {
     isTND = string(head)=="\x18TUNDRA24";
-    }
+  }
+  
+  in->clear();
   in->seekg (0, ios::beg);
   return isTND;
 }
@@ -1028,15 +1031,15 @@ void CodeGenerator::processInput()
     }
   }
 
- /* if (streamIsXBIN()) {
-   *out<<"Please apply --art-bin option for XBIN files.";
+  if (streamIsXBIN()) {
+   *out<<"Please apply --art-bin option for XBIN files.\n";
    return; 
   }
 
   if (streamIsTundra()) {
-   *out<<"Please apply --art-tundra option for TND files.";
+   *out<<"Please apply --art-tundra option for TND files.\n";
    return; 
-  }*/
+  }
 
   string line;
   size_t i=0;

src/version.h

@@ -25,7 +25,7 @@ along with ANSIFilter.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef VERSION_H
 #define VERSION_H
 
-#define ANSIFILTER_VERSION "2.6"
+#define ANSIFILTER_VERSION "2.7"
 
 #define ANSIFILTER_URL   "http://www.andre-simon.de/"
 #define ANSIFILTER_EMAIL "[email protected]"