fix

diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 22419e107b890bfb7e37d07de40192711147e727..dbd10c35e6029a815fa46359f532221d0f34151a 100644 (file)
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -298,7 +298,7 @@ GNUNET_FS_directory_list_contents (size_t size,
         }
       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,

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 746303c691b1b44e2fc4ea1367ef08487cb0180f..d7f1de283dea905e3ce91fae1efa1cb908adc6a1 100644 (file)
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -853,7 +853,7 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md
   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;

diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index c91dbd530b371d69b2272a10cd0c18857205d726..e0b04884357ba36a66fa78ad083a350e46fbb1e3 100644 (file)
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -190,7 +190,7 @@ GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h,
     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 @@ GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h,
     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,

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 058883c043e14e798e7bd42f3cb368537dedad63..bc75c2a4097df9e8d869c306dd38cad164c243fd 100644 (file)
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -947,7 +947,7 @@ GNUNET_FS_publish_main_ (void *cls,
       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)
            {

diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 06040359866f5ace90a5e331f68083cbc6c0adb0..5aaf362d9cf99f49cfa9469dd824dfbd53485277 100644 (file)
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -199,7 +199,7 @@ meta_printer (void *cls,
   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 @@ publish_inspector (void *cls,
   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"),

diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index c3ca937133b6dd5695ef45bbb3a3384b5dfb1b1a..e48bc85124149aaf3165bf63e3c800e469ebd9dc 100644 (file)
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -154,7 +154,7 @@ progress_cb (void *cls,
       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, "..")))

diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 1abb4c13ff68592f11d6ed954f97a828ae0162ae..85b17c7ddb7143a1db522ab1d30d09866b638773 100644 (file)
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -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"
 {