diff options
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_directory.c | 2 | ||||
-rw-r--r-- | src/fs/fs_download.c | 2 | ||||
-rw-r--r-- | src/fs/fs_file_information.c | 4 | ||||
-rw-r--r-- | src/fs/fs_publish.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-publish.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-search.c | 2 |
6 files changed, 8 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, | |||
298 | } | 298 | } |
299 | pos += mdSize; | 299 | pos += mdSize; |
300 | filename = GNUNET_CONTAINER_meta_data_get_by_type (md, | 300 | filename = GNUNET_CONTAINER_meta_data_get_by_type (md, |
301 | EXTRACTOR_METATYPE_FILENAME); | 301 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); |
302 | full_data.size = 0; | 302 | full_data.size = 0; |
303 | full_data.data = NULL; | 303 | full_data.data = NULL; |
304 | GNUNET_CONTAINER_meta_data_iterate (md, | 304 | 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 | |||
853 | const char *ext; | 853 | const char *ext; |
854 | 854 | ||
855 | ret = GNUNET_CONTAINER_meta_data_get_by_type (md, | 855 | ret = GNUNET_CONTAINER_meta_data_get_by_type (md, |
856 | EXTRACTOR_METATYPE_FILENAME); | 856 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); |
857 | if (ret != NULL) | 857 | if (ret != NULL) |
858 | return ret; | 858 | return ret; |
859 | ext = NULL; | 859 | 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, | |||
190 | fn = ss + 1; | 190 | fn = ss + 1; |
191 | GNUNET_CONTAINER_meta_data_insert (ret->meta, | 191 | GNUNET_CONTAINER_meta_data_insert (ret->meta, |
192 | "<gnunet>", | 192 | "<gnunet>", |
193 | EXTRACTOR_METATYPE_FILENAME, | 193 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, |
194 | EXTRACTOR_METAFORMAT_C_STRING, | 194 | EXTRACTOR_METAFORMAT_C_STRING, |
195 | "text/plain", | 195 | "text/plain", |
196 | fn, | 196 | fn, |
@@ -619,7 +619,7 @@ GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h, | |||
619 | fn = ss + 1; | 619 | fn = ss + 1; |
620 | GNUNET_CONTAINER_meta_data_insert (ret->meta, | 620 | GNUNET_CONTAINER_meta_data_insert (ret->meta, |
621 | "<gnunet>", | 621 | "<gnunet>", |
622 | EXTRACTOR_METATYPE_FILENAME, | 622 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, |
623 | EXTRACTOR_METAFORMAT_C_STRING, | 623 | EXTRACTOR_METAFORMAT_C_STRING, |
624 | "text/plain", | 624 | "text/plain", |
625 | fn, | 625 | 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, | |||
947 | while (NULL != p->dir) | 947 | while (NULL != p->dir) |
948 | { | 948 | { |
949 | fn = GNUNET_CONTAINER_meta_data_get_by_type (p->meta, | 949 | fn = GNUNET_CONTAINER_meta_data_get_by_type (p->meta, |
950 | EXTRACTOR_METATYPE_FILENAME); | 950 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); |
951 | p = p->dir; | 951 | p = p->dir; |
952 | if (fn != NULL) | 952 | if (fn != NULL) |
953 | { | 953 | { |
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, | |||
199 | if ( (format != EXTRACTOR_METAFORMAT_UTF8) && | 199 | if ( (format != EXTRACTOR_METAFORMAT_UTF8) && |
200 | (format != EXTRACTOR_METAFORMAT_C_STRING) ) | 200 | (format != EXTRACTOR_METAFORMAT_C_STRING) ) |
201 | return 0; | 201 | return 0; |
202 | if (type == EXTRACTOR_METATYPE_FILENAME) | 202 | if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) |
203 | return 0; | 203 | return 0; |
204 | fprintf (stdout, | 204 | fprintf (stdout, |
205 | "\t%s - %s\n", | 205 | "\t%s - %s\n", |
@@ -294,7 +294,7 @@ publish_inspector (void *cls, | |||
294 | if (extract_only) | 294 | if (extract_only) |
295 | { | 295 | { |
296 | fn = GNUNET_CONTAINER_meta_data_get_by_type (m, | 296 | fn = GNUNET_CONTAINER_meta_data_get_by_type (m, |
297 | EXTRACTOR_METATYPE_FILENAME); | 297 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); |
298 | fs = GNUNET_STRINGS_byte_size_fancy (length); | 298 | fs = GNUNET_STRINGS_byte_size_fancy (length); |
299 | fprintf (stdout, | 299 | fprintf (stdout, |
300 | _("Meta data for file `%s' (%s)\n"), | 300 | _("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, | |||
154 | printf ("#%u:\n", cnt++); | 154 | printf ("#%u:\n", cnt++); |
155 | filename = | 155 | filename = |
156 | GNUNET_CONTAINER_meta_data_get_by_type (info->value.search.specifics.result.meta, | 156 | GNUNET_CONTAINER_meta_data_get_by_type (info->value.search.specifics.result.meta, |
157 | EXTRACTOR_METATYPE_FILENAME); | 157 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); |
158 | if (filename != NULL) | 158 | if (filename != NULL) |
159 | { | 159 | { |
160 | while (NULL != (dotdot = strstr (filename, ".."))) | 160 | while (NULL != (dotdot = strstr (filename, ".."))) |