diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-12-30 22:44:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-12-30 22:44:49 +0000 |
commit | d60192bbfe69cb3d8e36afaf459f72bb9fa4d288 (patch) | |
tree | 5feadcb1dc083dc1dd166f31c101242db6c0567b /src/fs/fs_file_information.c | |
parent | f5a017ed63ee50feeefc6f0c2b28549aeca92ded (diff) | |
download | gnunet-d60192bbfe69cb3d8e36afaf459f72bb9fa4d288.tar.gz gnunet-d60192bbfe69cb3d8e36afaf459f72bb9fa4d288.zip |
-LRN: utf8-ization, #2051
Diffstat (limited to 'src/fs/fs_file_information.c')
-rw-r--r-- | src/fs/fs_file_information.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c index 4ea264892..c2ab84ec2 100644 --- a/src/fs/fs_file_information.c +++ b/src/fs/fs_file_information.c | |||
@@ -173,10 +173,17 @@ GNUNET_FS_file_information_create_from_file (struct GNUNET_FS_Handle *h, | |||
173 | #endif | 173 | #endif |
174 | while (NULL != (ss = strstr (fn, DIR_SEPARATOR_STR))) | 174 | while (NULL != (ss = strstr (fn, DIR_SEPARATOR_STR))) |
175 | fn = ss + 1; | 175 | fn = ss + 1; |
176 | #if !WINDOWS | ||
176 | GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>", | 177 | GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>", |
177 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, | 178 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, |
178 | EXTRACTOR_METAFORMAT_C_STRING, | 179 | EXTRACTOR_METAFORMAT_C_STRING, |
179 | "text/plain", fn, strlen (fn) + 1); | 180 | "text/plain", fn, strlen (fn) + 1); |
181 | #else | ||
182 | GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>", | ||
183 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, | ||
184 | EXTRACTOR_METAFORMAT_UTF8, | ||
185 | "text/plain", fn, strlen (fn) + 1); | ||
186 | #endif | ||
180 | return ret; | 187 | return ret; |
181 | } | 188 | } |
182 | 189 | ||
@@ -770,10 +777,17 @@ GNUNET_FS_file_information_create_from_directory (struct GNUNET_FS_Handle *h, | |||
770 | while ((NULL != (ss = strstr (fn, DIR_SEPARATOR_STR))) && (strlen (ss) > 1)) | 777 | while ((NULL != (ss = strstr (fn, DIR_SEPARATOR_STR))) && (strlen (ss) > 1)) |
771 | fn = ss + 1; | 778 | fn = ss + 1; |
772 | GNUNET_asprintf (&dn, "%s/", fn); | 779 | GNUNET_asprintf (&dn, "%s/", fn); |
780 | #if !WINDOWS | ||
773 | GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>", | 781 | GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>", |
774 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, | 782 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, |
775 | EXTRACTOR_METAFORMAT_C_STRING, | 783 | EXTRACTOR_METAFORMAT_C_STRING, |
776 | "text/plain", dn, strlen (dn) + 1); | 784 | "text/plain", dn, strlen (dn) + 1); |
785 | #else | ||
786 | GNUNET_CONTAINER_meta_data_insert (ret->meta, "<gnunet>", | ||
787 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, | ||
788 | EXTRACTOR_METAFORMAT_UTF8, | ||
789 | "text/plain", dn, strlen (dn) + 1); | ||
790 | #endif | ||
777 | GNUNET_free (dn); | 791 | GNUNET_free (dn); |
778 | ret->filename = GNUNET_strdup (filename); | 792 | ret->filename = GNUNET_strdup (filename); |
779 | return ret; | 793 | return ret; |