diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-10 22:47:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-10 22:47:57 +0000 |
commit | 7e5c0a94bacdfe6e1c65035b16fd97a77398df12 (patch) | |
tree | 70380ec85a0f4841247de81e8359e063da7486c1 /src/fs | |
parent | df62a12c9b51fd13cc37058d4a88a32d93386d79 (diff) | |
download | gnunet-7e5c0a94bacdfe6e1c65035b16fd97a77398df12.tar.gz gnunet-7e5c0a94bacdfe6e1c65035b16fd97a77398df12.zip |
LRN: new utf8 argv converter for W32, converting strings on command-line to UTF-8 for all command-line tools.
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-directory.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-download.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-fs.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-helper-fs-publish.c | 5 | ||||
-rw-r--r-- | src/fs/gnunet-pseudonym.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-publish.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-search.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-unindex.c | 4 |
8 files changed, 32 insertions, 1 deletions
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c index c722f57ff..4122cb154 100644 --- a/src/fs/gnunet-directory.c +++ b/src/fs/gnunet-directory.c | |||
@@ -173,6 +173,10 @@ main (int argc, char *const *argv) | |||
173 | static struct GNUNET_GETOPT_CommandLineOption options[] = { | 173 | static struct GNUNET_GETOPT_CommandLineOption options[] = { |
174 | GNUNET_GETOPT_OPTION_END | 174 | GNUNET_GETOPT_OPTION_END |
175 | }; | 175 | }; |
176 | |||
177 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
178 | return 2; | ||
179 | |||
176 | return (GNUNET_OK == | 180 | return (GNUNET_OK == |
177 | GNUNET_PROGRAM_run (argc, argv, "gnunet-directory [OPTIONS] FILENAME", | 181 | GNUNET_PROGRAM_run (argc, argv, "gnunet-directory [OPTIONS] FILENAME", |
178 | gettext_noop | 182 | gettext_noop |
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c index 5a66aea27..bd5b09c0d 100644 --- a/src/fs/gnunet-download.c +++ b/src/fs/gnunet-download.c | |||
@@ -272,6 +272,10 @@ main (int argc, char *const *argv) | |||
272 | 0, &GNUNET_GETOPT_increment_value, &verbose}, | 272 | 0, &GNUNET_GETOPT_increment_value, &verbose}, |
273 | GNUNET_GETOPT_OPTION_END | 273 | GNUNET_GETOPT_OPTION_END |
274 | }; | 274 | }; |
275 | |||
276 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
277 | return 2; | ||
278 | |||
275 | return (GNUNET_OK == | 279 | return (GNUNET_OK == |
276 | GNUNET_PROGRAM_run (argc, argv, "gnunet-download [OPTIONS] URI", | 280 | GNUNET_PROGRAM_run (argc, argv, "gnunet-download [OPTIONS] URI", |
277 | gettext_noop | 281 | gettext_noop |
diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c index 0b2892371..404c64e4d 100644 --- a/src/fs/gnunet-fs.c +++ b/src/fs/gnunet-fs.c | |||
@@ -119,6 +119,10 @@ main (int argc, char *const *argv) | |||
119 | GNUNET_GETOPT_OPTION_VERBOSE (&verbose), | 119 | GNUNET_GETOPT_OPTION_VERBOSE (&verbose), |
120 | GNUNET_GETOPT_OPTION_END | 120 | GNUNET_GETOPT_OPTION_END |
121 | }; | 121 | }; |
122 | |||
123 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
124 | return 2; | ||
125 | |||
122 | return (GNUNET_OK == | 126 | return (GNUNET_OK == |
123 | GNUNET_PROGRAM_run (argc, argv, "gnunet-fs [OPTIONS]", | 127 | GNUNET_PROGRAM_run (argc, argv, "gnunet-fs [OPTIONS]", |
124 | gettext_noop ("Special file-sharing operations"), | 128 | gettext_noop ("Special file-sharing operations"), |
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c index 86b02492d..45f6d588d 100644 --- a/src/fs/gnunet-helper-fs-publish.c +++ b/src/fs/gnunet-helper-fs-publish.c | |||
@@ -413,7 +413,7 @@ extract_files (struct ScanTreeNode *item) | |||
413 | * @return 0 on success | 413 | * @return 0 on success |
414 | */ | 414 | */ |
415 | int main(int argc, | 415 | int main(int argc, |
416 | char **argv) | 416 | char *const *argv) |
417 | { | 417 | { |
418 | const char *filename_expanded; | 418 | const char *filename_expanded; |
419 | const char *ex; | 419 | const char *ex; |
@@ -424,6 +424,9 @@ int main(int argc, | |||
424 | * binary mode. | 424 | * binary mode. |
425 | */ | 425 | */ |
426 | _setmode (1, _O_BINARY); | 426 | _setmode (1, _O_BINARY); |
427 | /* Get utf-8-encoded arguments */ | ||
428 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
429 | return 5; | ||
427 | #endif | 430 | #endif |
428 | 431 | ||
429 | /* parse command line */ | 432 | /* parse command line */ |
diff --git a/src/fs/gnunet-pseudonym.c b/src/fs/gnunet-pseudonym.c index 38826d1de..2b1b897c2 100644 --- a/src/fs/gnunet-pseudonym.c +++ b/src/fs/gnunet-pseudonym.c | |||
@@ -313,6 +313,10 @@ main (int argc, char *const *argv) | |||
313 | }; | 313 | }; |
314 | bo.expiration_time = | 314 | bo.expiration_time = |
315 | GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2); | 315 | GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2); |
316 | |||
317 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
318 | return 2; | ||
319 | |||
316 | return (GNUNET_OK == | 320 | return (GNUNET_OK == |
317 | GNUNET_PROGRAM_run (argc, argv, "gnunet-pseudonym [OPTIONS]", | 321 | GNUNET_PROGRAM_run (argc, argv, "gnunet-pseudonym [OPTIONS]", |
318 | gettext_noop ("Manage GNUnet pseudonyms."), | 322 | gettext_noop ("Manage GNUnet pseudonyms."), |
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index a1b26dbd5..24e49d369 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c | |||
@@ -736,6 +736,10 @@ main (int argc, char *const *argv) | |||
736 | "GNUnet publish starts\n"); | 736 | "GNUnet publish starts\n"); |
737 | bo.expiration_time = | 737 | bo.expiration_time = |
738 | GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2); | 738 | GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2); |
739 | |||
740 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
741 | return 2; | ||
742 | |||
739 | return (GNUNET_OK == | 743 | return (GNUNET_OK == |
740 | GNUNET_PROGRAM_run (argc, argv, "gnunet-publish [OPTIONS] FILENAME", | 744 | GNUNET_PROGRAM_run (argc, argv, "gnunet-publish [OPTIONS] FILENAME", |
741 | gettext_noop | 745 | gettext_noop |
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index 60620a4b3..88507f608 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c | |||
@@ -302,6 +302,10 @@ main (int argc, char *const *argv) | |||
302 | 1, &GNUNET_GETOPT_set_uint, &results_limit}, | 302 | 1, &GNUNET_GETOPT_set_uint, &results_limit}, |
303 | GNUNET_GETOPT_OPTION_END | 303 | GNUNET_GETOPT_OPTION_END |
304 | }; | 304 | }; |
305 | |||
306 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
307 | return 2; | ||
308 | |||
305 | return (GNUNET_OK == | 309 | return (GNUNET_OK == |
306 | GNUNET_PROGRAM_run (argc, argv, "gnunet-search [OPTIONS] KEYWORD", | 310 | GNUNET_PROGRAM_run (argc, argv, "gnunet-search [OPTIONS] KEYWORD", |
307 | gettext_noop | 311 | gettext_noop |
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c index 3e8308df2..f4e352737 100644 --- a/src/fs/gnunet-unindex.c +++ b/src/fs/gnunet-unindex.c | |||
@@ -170,6 +170,10 @@ main (int argc, char *const *argv) | |||
170 | 0, &GNUNET_GETOPT_set_one, &verbose}, | 170 | 0, &GNUNET_GETOPT_set_one, &verbose}, |
171 | GNUNET_GETOPT_OPTION_END | 171 | GNUNET_GETOPT_OPTION_END |
172 | }; | 172 | }; |
173 | |||
174 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
175 | return 2; | ||
176 | |||
173 | return (GNUNET_OK == | 177 | return (GNUNET_OK == |
174 | GNUNET_PROGRAM_run (argc, argv, "gnunet-unindex [OPTIONS] FILENAME", | 178 | GNUNET_PROGRAM_run (argc, argv, "gnunet-unindex [OPTIONS] FILENAME", |
175 | gettext_noop | 179 | gettext_noop |