[GNUnet-SVN] r2456 - in Extractor: . src/plugins

[grothoff]

Author: grothoff
Date: 2006-01-31 12:24:31 -0800 (Tue, 31 Jan 2006)
New Revision: 2456

Modified:
   Extractor/ChangeLog
   Extractor/src/plugins/manextractor.c
Log:
From: 
Ronan MELENNEC <address@hidden>
  To: 
  address@hidden
    Date: 
    Today 09:42:09 am
       
         Hello Christian,

         I attach a patch to prevent manextractor.c to output false positives
         (e.g. when there is a man page at beginning of a TAR archive).

         Cordially,
         
         Ronan Melennec   


Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2006-01-24 02:37:37 UTC (rev 2455)
+++ Extractor/ChangeLog 2006-01-31 20:24:31 UTC (rev 2456)
@@ -1,3 +1,6 @@
+Tue Jan 31 12:51:55 PST 2006
+       Mis-detection of man pages as part of TAR archives fixed.
+
 Wed Jan 11 11:33:46 PST 2006
        More Mime-types for the OLE2 extractor.  Also ignore (harmless) 
        libc errors in plugins when extracting.

Modified: Extractor/src/plugins/manextractor.c
===================================================================
--- Extractor/src/plugins/manextractor.c        2006-01-24 02:37:37 UTC (rev 
2455)
+++ Extractor/src/plugins/manextractor.c        2006-01-31 20:24:31 UTC (rev 
2456)
@@ -20,7 +20,7 @@
 
 #include "platform.h"
 #include "extractor.h"
-#include <zlib.h>
+#include <ctype.h>
 
 static char * stndup(const char * str,
                      size_t n) {
@@ -105,8 +105,11 @@
                          &buf[pos],
                          xlen)) ||
            ( (pos != 0) &&
-             (buf[pos-1] != '\n') ) ) )
+             (buf[pos-1] != '\n') ) ) ) {
+    if ( !isgraph(buf[pos]) && !isspace(buf[pos]) )
+      return prev;
     pos++;
+  }
   xsize = pos;
   while ( (xsize < size) &&
          (buf[xsize] != '\n') )