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

[grothoff]

Author: grothoff
Date: 2005-08-23 12:29:55 -0700 (Tue, 23 Aug 2005)
New Revision: 1871

Modified:
   Extractor/ChangeLog
   Extractor/TODO
   Extractor/src/plugins/ole2/ole2extractor.c
Log:
bugfix - ole2 character set conversion

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2005-08-23 08:56:22 UTC (rev 1870)
+++ Extractor/ChangeLog 2005-08-23 19:29:55 UTC (rev 1871)
@@ -1,3 +1,7 @@
+Tue Aug 23 12:35:35 PDT 2005
+       Fixed character set conversion in OLE2 extractor
+       (big thanks to Jody Goldberg).
+
 Sat Aug 20 21:27:17 PDT 2005
        Fixed memory leak in thumbnail extractor.
 

Modified: Extractor/TODO
===================================================================
--- Extractor/TODO      2005-08-23 08:56:22 UTC (rev 1870)
+++ Extractor/TODO      2005-08-23 19:29:55 UTC (rev 1871)
@@ -43,5 +43,5 @@
 * DEB: to be done
 * ASF: ?
 * HTML: to be done
-* OLE2: done, but buggy
+* OLE2: done
 * OO: to be done

Modified: Extractor/src/plugins/ole2/ole2extractor.c
===================================================================
--- Extractor/src/plugins/ole2/ole2extractor.c  2005-08-23 08:56:22 UTC (rev 
1870)
+++ Extractor/src/plugins/ole2/ole2extractor.c  2005-08-23 19:29:55 UTC (rev 
1871)
@@ -798,7 +798,7 @@
          int ipc;
        
          if (G_VALUE_TYPE(v) == G_TYPE_STRING) {
-           contents = g_strdup_value_contents(v);
+           contents = strdup(g_value_get_string(v));
          } else {
            /* convert other formats? */
            contents = g_strdup_value_contents(v);
@@ -809,9 +809,9 @@
              if ( (isprint(contents[ipc])) &&
                   (! isspace(contents[ipc])) )
                pc++;
-           if (NULL != strstr(contents,
-                              "\\n"))
-             strstr(contents, "\\n")[0] = '\0'; /* kill '\n' */
+           if ( (strlen(contents) > 0) &&
+                (contents[strlen(contents)-1] == '\n') )
+                contents[strlen(contents)-1] = '\0';
          }
          if (pc > 0) {
            int pos = 0;