ats_ril: - removed some redundantly saved plugin environment attributes

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

diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c
index b50d0624bfe35cf4268d3baef83d0539fca66ad7..d7ff97c6b7c20c075f422ca3869373cbc8fb1644 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 ******************** */
 
@@ -55,13 +55,13 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext
   {
     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)
@@ -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)
   {