[GNUnet-SVN] r14106 - in gnunet/src: fs include

[gnunet]

Author: grothoff
Date: 2011-01-03 17:00:02 +0100 (Mon, 03 Jan 2011)
New Revision: 14106

Modified:
   gnunet/src/fs/fs_directory.c
   gnunet/src/fs/fs_download.c
   gnunet/src/fs/fs_file_information.c
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/gnunet-publish.c
   gnunet/src/fs/gnunet-search.c
   gnunet/src/include/gnunet_container_lib.h
Log:
fix

Modified: gnunet/src/fs/fs_directory.c
===================================================================
--- gnunet/src/fs/fs_directory.c        2011-01-03 15:59:48 UTC (rev 14105)
+++ gnunet/src/fs/fs_directory.c        2011-01-03 16:00:02 UTC (rev 14106)
@@ -298,7 +298,7 @@
         }
       pos += mdSize;
       filename = GNUNET_CONTAINER_meta_data_get_by_type (md,
-                                                        
EXTRACTOR_METATYPE_FILENAME);
+                                                        
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
       full_data.size = 0;
       full_data.data = NULL;
       GNUNET_CONTAINER_meta_data_iterate (md,

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2011-01-03 15:59:48 UTC (rev 14105)
+++ gnunet/src/fs/fs_download.c 2011-01-03 16:00:02 UTC (rev 14106)
@@ -853,7 +853,7 @@
   const char *ext;
 
   ret = GNUNET_CONTAINER_meta_data_get_by_type (md,
-                                               EXTRACTOR_METATYPE_FILENAME);
+                                               
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
   if (ret != NULL)
     return ret;  
   ext = NULL;

Modified: gnunet/src/fs/fs_file_information.c
===================================================================
--- gnunet/src/fs/fs_file_information.c 2011-01-03 15:59:48 UTC (rev 14105)
+++ gnunet/src/fs/fs_file_information.c 2011-01-03 16:00:02 UTC (rev 14106)
@@ -190,7 +190,7 @@
     fn = ss + 1;
   GNUNET_CONTAINER_meta_data_insert (ret->meta,
                                     "<gnunet>",
-                                    EXTRACTOR_METATYPE_FILENAME,
+                                    
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                     EXTRACTOR_METAFORMAT_C_STRING,
                                     "text/plain",
                                     fn,
@@ -619,7 +619,7 @@
     fn = ss + 1;
   GNUNET_CONTAINER_meta_data_insert (ret->meta,
                                     "<gnunet>",
-                                    EXTRACTOR_METATYPE_FILENAME,
+                                    
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                     EXTRACTOR_METAFORMAT_C_STRING,
                                     "text/plain",
                                     fn,

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2011-01-03 15:59:48 UTC (rev 14105)
+++ gnunet/src/fs/fs_publish.c  2011-01-03 16:00:02 UTC (rev 14106)
@@ -947,7 +947,7 @@
       while (NULL != p->dir)
        {
          fn = GNUNET_CONTAINER_meta_data_get_by_type (p->meta,
-                                                      
EXTRACTOR_METATYPE_FILENAME);
+                                                      
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
          p = p->dir;
          if (fn != NULL)
            {

Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c      2011-01-03 15:59:48 UTC (rev 14105)
+++ gnunet/src/fs/gnunet-publish.c      2011-01-03 16:00:02 UTC (rev 14106)
@@ -199,7 +199,7 @@
   if ( (format != EXTRACTOR_METAFORMAT_UTF8) &&
        (format != EXTRACTOR_METAFORMAT_C_STRING) )
     return 0;
-  if (type == EXTRACTOR_METATYPE_FILENAME) 
+  if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) 
     return 0;
   fprintf (stdout, 
           "\t%s - %s\n",
@@ -294,7 +294,7 @@
   if (extract_only)
     {
       fn = GNUNET_CONTAINER_meta_data_get_by_type (m,
-                                                  EXTRACTOR_METATYPE_FILENAME);
+                                                  
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
       fs = GNUNET_STRINGS_byte_size_fancy (length);
       fprintf (stdout,
               _("Meta data for file `%s' (%s)\n"),

Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c       2011-01-03 15:59:48 UTC (rev 14105)
+++ gnunet/src/fs/gnunet-search.c       2011-01-03 16:00:02 UTC (rev 14106)
@@ -154,7 +154,7 @@
       printf ("#%u:\n", cnt++);
       filename =
         GNUNET_CONTAINER_meta_data_get_by_type 
(info->value.search.specifics.result.meta,
-                                               EXTRACTOR_METATYPE_FILENAME);
+                                               
EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
       if (filename != NULL)
         {
           while (NULL != (dotdot = strstr (filename, "..")))

Modified: gnunet/src/include/gnunet_container_lib.h
===================================================================
--- gnunet/src/include/gnunet_container_lib.h   2011-01-03 15:59:48 UTC (rev 
14105)
+++ gnunet/src/include/gnunet_container_lib.h   2011-01-03 16:00:02 UTC (rev 
14106)
@@ -33,6 +33,11 @@
 #include "gnunet_crypto_lib.h"
 #include <extractor.h>
 
+#ifndef EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME
+/* hack for LE < 0.6.3 */
+#define EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME 180
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {