aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_file_information.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-01-24 13:40:47 +0000
committerChristian Grothoff <christian@grothoff.org>2011-01-24 13:40:47 +0000
commitf3fd2bc175ff3bee8680106782ab01e8b69c7724 (patch)
treeca69cbc7a4eb8a7cc982c74120d05db283a90cc8 /src/fs/fs_file_information.c
parent41d967a58fdf9df3b462980a3172ce1cb90cf334 (diff)
downloadgnunet-f3fd2bc175ff3bee8680106782ab01e8b69c7724.tar.gz
gnunet-f3fd2bc175ff3bee8680106782ab01e8b69c7724.zip
append / to directory names (and remove later...)
Diffstat (limited to 'src/fs/fs_file_information.c')
-rw-r--r--src/fs/fs_file_information.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index e0b048843..2ae708e59 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -422,7 +422,6 @@ dir_scan_cb (void *cls,
422 GNUNET_FS_meta_data_extract_from_file (meta, 422 GNUNET_FS_meta_data_extract_from_file (meta,
423 filename, 423 filename,
424 dsc->extractors); 424 dsc->extractors);
425 // FIXME: remove path from filename in metadata!
426 keywords = GNUNET_FS_uri_ksk_create_from_meta_data (meta); 425 keywords = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
427 ksk_uri = GNUNET_FS_uri_ksk_canonicalize (keywords); 426 ksk_uri = GNUNET_FS_uri_ksk_canonicalize (keywords);
428 fi = GNUNET_FS_file_information_create_from_file (dsc->h, 427 fi = GNUNET_FS_file_information_create_from_file (dsc->h,
@@ -582,6 +581,7 @@ GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h,
582 struct GNUNET_CONTAINER_MetaData *meta; 581 struct GNUNET_CONTAINER_MetaData *meta;
583 const char *fn; 582 const char *fn;
584 const char *ss; 583 const char *ss;
584 char *dn;
585 585
586 dc.entries = NULL; 586 dc.entries = NULL;
587 meta = GNUNET_CONTAINER_meta_data_create (); 587 meta = GNUNET_CONTAINER_meta_data_create ();
@@ -617,13 +617,17 @@ GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h,
617 DIR_SEPARATOR_STR))) && 617 DIR_SEPARATOR_STR))) &&
618 (strlen (ss) > 1) ) 618 (strlen (ss) > 1) )
619 fn = ss + 1; 619 fn = ss + 1;
620 GNUNET_asprintf (&dn,
621 "%s/",
622 fn);
620 GNUNET_CONTAINER_meta_data_insert (ret->meta, 623 GNUNET_CONTAINER_meta_data_insert (ret->meta,
621 "<gnunet>", 624 "<gnunet>",
622 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, 625 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
623 EXTRACTOR_METAFORMAT_C_STRING, 626 EXTRACTOR_METAFORMAT_C_STRING,
624 "text/plain", 627 "text/plain",
625 fn, 628 dn,
626 strlen (fn) + 1); 629 strlen (dn) + 1);
630 GNUNET_free (dn);
627 ret->filename = GNUNET_strdup (filename); 631 ret->filename = GNUNET_strdup (filename);
628 return ret; 632 return ret;
629} 633}