From 17d48a5d001e42727443faed87358e289bc6f0d3 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 3 Jan 2011 16:00:02 +0000
Subject: fix

---
 src/fs/fs_directory.c              | 2 +-
 src/fs/fs_download.c               | 2 +-
 src/fs/fs_file_information.c       | 4 ++--
 src/fs/fs_publish.c                | 2 +-
 src/fs/gnunet-publish.c            | 4 ++--
 src/fs/gnunet-search.c             | 2 +-
 src/include/gnunet_container_lib.h | 5 +++++
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 22419e107..dbd10c35e 100644
--- 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 746303c69..d7f1de283 100644
--- 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 c91dbd530..e0b048843 100644
--- 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 058883c04..bc75c2a40 100644
--- 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 060403598..5aaf362d9 100644
--- 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 c3ca93713..e48bc8512 100644
--- 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 1abb4c13f..85b17c7dd 100644
--- 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"
 {
-- 
cgit v1.2.3