diff options
| author | LRN <LRN@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-10-30 22:12:03 +0000 |
|---|---|---|
| committer | LRN <LRN@140774ce-b5e7-0310-ab8b-a85725594a96> | 2012-10-30 22:12:03 +0000 |
| commit | 3697af113a8c934b5a8d51eebe6d45af0dcc3dad (patch) | |
| tree | 4ce33c4fad5486af3d45ececb47aff7110ed8c74 /src/fs | |
| parent | 47ab71550ad863e251c0c8d7cc57365f6104cc5a (diff) | |
Fix ENABLE_NLS usage
ENABLE_NLS is for gettext only, it's not an indicator of nl_langinfo
availability.
Use unistring instead of nl_langinfo, since unistring is always there.
GNUnet supports UTF-8 now (or should support), so most conversions are
unnecessary anyway.
git-svn-id: https://gnunet.org/svn/gnunet@24624 140774ce-b5e7-0310-ab8b-a85725594a96
Diffstat (limited to 'src/fs')
| -rw-r--r-- | src/fs/fs_getopt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index 03747742b4..6cc4021156 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c @@ -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) { |