start fewer FS probes concurrently, run them all in the same task to avoid undue...

[oweals/gnunet.git] / src / fs / fs_getopt.c

diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c
index 6c54fd69b8aa075abeee263f6510dc4c5bf5d673..5e95109566c27b9e5ed98a85f27d00e161b860f1 100644 (file)
--- a/src/fs/fs_getopt.c
+++ b/src/fs/fs_getopt.c
@@ -25,7 +25,7 @@
  */
 #include "platform.h"
 #include "gnunet_fs_service.h"
-#include "fs.h"
+#include "fs_api.h"
 
 /* ******************** command-line option parsing API ******************** */
 
@@ -53,15 +53,15 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext
 
   if (u == NULL)
   {
-    u = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
+    u = GNUNET_new (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)
@@ -139,11 +139,12 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
     *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)
   {
@@ -154,9 +155,7 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
         (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],
@@ -170,9 +169,7 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
         (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],
@@ -186,11 +183,10 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext
   }
   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"),