*/
#include "platform.h"
#include "gnunet_fs_service.h"
-#include "fs.h"
+#include "fs_api.h"
/* ******************** command-line option parsing API ******************** */
{
u = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
*uri = u;
- u->type = ksk;
+ u->type = GNUNET_FS_URI_KSK;
u->data.ksk.keywordCount = 0;
u->data.ksk.keywords = NULL;
}
else
{
- GNUNET_assert (u->type == ksk);
+ GNUNET_assert (u->type == GNUNET_FS_URI_KSK);
}
slen = strlen (value);
if (slen == 0)
*mm = meta;
}
-#if ENABLE_NLS
- tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), nl_langinfo (CODESET));
-#else
- tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), "utf-8");
-#endif
+ /* Use GNUNET_STRINGS_get_utf8_args() in main() to acquire utf-8-encoded
+ * commandline arguments, so that the following line is not needed.
+ */
+ /*tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), locale_charset ());*/
+ tmp = GNUNET_strdup (value);
+
type = EXTRACTOR_metatype_get_max ();
while (type > 0)
{
(tmp[strlen (typename)] == ':') &&
(0 == strncmp (typename, tmp, strlen (typename))))
{
- GNUNET_CONTAINER_meta_data_insert (meta,
- "<gnunet>",
- type,
+ GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>", type,
EXTRACTOR_METAFORMAT_UTF8,
"text/plain",
&tmp[strlen (typename) + 1],
(tmp[strlen (typename_i18n)] == ':') &&
(0 == strncmp (typename_i18n, tmp, strlen (typename_i18n))))
{
- GNUNET_CONTAINER_meta_data_insert (meta,
- "<gnunet>",
- type,
+ GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>", type,
EXTRACTOR_METAFORMAT_UTF8,
"text/plain",
&tmp[strlen (typename_i18n) + 1],
}
if (tmp != NULL)
{
- GNUNET_CONTAINER_meta_data_insert (meta,
- "<gnunet>",
+ GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>",
EXTRACTOR_METATYPE_UNKNOWN,
- EXTRACTOR_METAFORMAT_UTF8,
- "text/plain", tmp, strlen (tmp) + 1);
+ EXTRACTOR_METAFORMAT_UTF8, "text/plain",
+ tmp, strlen (tmp) + 1);
GNUNET_free (tmp);
printf (_
("Unknown metadata type in metadata option `%s'. Using metadata type `unknown' instead.\n"),