commit c6023c038445d0b7a48194824717c3253c9af7f0 parent 6466e238a122a76bab6e801ef3a14b3a6884c1fc Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Thu, 24 Oct 2024 12:29:31 +0200 util: Removed unnecessary and dangerous GNUNET_STRINGS_get_utf8_args. Fixes #9274 NEWS: GNUNET_STRINGS_get_utf8_args removed. Diffstat:
55 files changed, 3 insertions(+), 306 deletions(-)
diff --git a/src/cli/arm/gnunet-arm.c b/src/cli/arm/gnunet-arm.c @@ -1036,12 +1036,6 @@ main (int argc, char *const *argv) }; int lret; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, - argv, - &argc, - &argv)) - return 2; if (GNUNET_OK == (lret = GNUNET_PROGRAM_run ( argc, @@ -1053,10 +1047,8 @@ main (int argc, char *const *argv) &run, NULL))) { - GNUNET_free_nz ((void *) argv); return ret; } - GNUNET_free_nz ((void *) argv); return lret; } diff --git a/src/cli/cadet/gnunet-cadet.c b/src/cli/cadet/gnunet-cadet.c @@ -829,9 +829,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - res = GNUNET_PROGRAM_run (argc, argv, "gnunet-cadet (OPTIONS | PEER_ID SHARED_SECRET)", @@ -840,8 +837,6 @@ main (int argc, char *const *argv) &run, NULL); - GNUNET_free_nz ((void *) argv); - if (GNUNET_OK == res) return 0; return 1; diff --git a/src/cli/core/gnunet-core.c b/src/cli/core/gnunet-core.c @@ -276,8 +276,6 @@ main (int argc, char *const *argv) &show_conns), GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; res = GNUNET_PROGRAM_run (argc, argv, "gnunet-core", @@ -287,7 +285,6 @@ main (int argc, char *const *argv) &run, NULL); - GNUNET_free_nz ((void *) argv); if (GNUNET_OK == res) return ret; return 1; diff --git a/src/cli/datastore/gnunet-datastore.c b/src/cli/datastore/gnunet-datastore.c @@ -489,9 +489,6 @@ main (int argc, char *const *argv) &file_name), GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - if (GNUNET_OK != GNUNET_PROGRAM_run (argc, argv, @@ -501,7 +498,6 @@ main (int argc, char *const *argv) &run, NULL)) ret = 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/dht/gnunet-dht-get.c b/src/cli/dht/gnunet-dht-get.c @@ -284,7 +284,6 @@ run (void *cls, int main (int argc, char *const *argv) { - char *u8_argv = NULL; struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_option_string ( 'k', @@ -326,10 +325,6 @@ main (int argc, char *const *argv) }; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; ret = (GNUNET_OK == GNUNET_PROGRAM_run ( argc, @@ -342,9 +337,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - // This is ugly, but meh. The GNUNET_STRINGS_get_utf8_args allows us to do this. - u8_argv = (char*) argv; - GNUNET_free (u8_argv); return ret; } diff --git a/src/cli/dht/gnunet-dht-hello.c b/src/cli/dht/gnunet-dht-hello.c @@ -154,10 +154,6 @@ main (int argc, }; enum GNUNET_GenericReturnValue iret; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; iret = GNUNET_PROGRAM_run ( argc, argv, diff --git a/src/cli/dht/gnunet-dht-monitor.c b/src/cli/dht/gnunet-dht-monitor.c @@ -325,9 +325,6 @@ main (int argc, char *const *argv) }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - return (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, diff --git a/src/cli/dht/gnunet-dht-put.c b/src/cli/dht/gnunet-dht-put.c @@ -179,7 +179,6 @@ run (void *cls, int main (int argc, char *const *argv) { - char *u8_argv = NULL; struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_option_string ( 'd', @@ -228,10 +227,6 @@ main (int argc, char *const *argv) }; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; expiration = GNUNET_TIME_UNIT_HOURS; ret = (GNUNET_OK == GNUNET_PROGRAM_run ( @@ -245,9 +240,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - // This is ugly, but meh. The GNUNET_STRINGS_get_utf8_args allows us to do this. - u8_argv = (char*) argv; - GNUNET_free (u8_argv); return ret; } diff --git a/src/cli/fs/gnunet-auto-share.c b/src/cli/fs/gnunet-auto-share.c @@ -746,8 +746,6 @@ main (int argc, char *const *argv) int ok; struct GNUNET_SIGNAL_Context *shc_chld; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE); GNUNET_assert (NULL != sigpipe); shc_chld = @@ -783,7 +781,6 @@ main (int argc, char *const *argv) sigpipe = NULL; GNUNET_free (cfg_filename); cfg_filename = NULL; - GNUNET_free_nz ((void *) argv); return ok; } diff --git a/src/cli/fs/gnunet-directory.c b/src/cli/fs/gnunet-directory.c @@ -190,9 +190,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, @@ -204,7 +201,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/fs/gnunet-download.c b/src/cli/fs/gnunet-download.c @@ -361,9 +361,6 @@ main (int argc, char *const *argv) &verbose), GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run ( @@ -377,7 +374,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/fs/gnunet-fs.c b/src/cli/fs/gnunet-fs.c @@ -167,10 +167,6 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, @@ -181,7 +177,6 @@ main (int argc, NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/fs/gnunet-publish.c b/src/cli/fs/gnunet-publish.c @@ -989,8 +989,6 @@ main (int argc, char *const *argv) bo.expiration_time = GNUNET_TIME_year_to_time (GNUNET_TIME_get_current_year () + 2); - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, @@ -1002,7 +1000,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/fs/gnunet-search.c b/src/cli/fs/gnunet-search.c @@ -797,9 +797,6 @@ main (int argc, char *const *argv) &verbose), GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 12; - if (GNUNET_SYSERR == GNUNET_PROGRAM_run (argc, argv, @@ -811,7 +808,6 @@ main (int argc, char *const *argv) NULL)) ret = 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/fs/gnunet-unindex.c b/src/cli/fs/gnunet-unindex.c @@ -183,9 +183,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run ( argc, @@ -198,7 +195,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/gns/gnunet-gns.c b/src/cli/gns/gnunet-gns.c @@ -388,11 +388,6 @@ main (int argc, char *const *argv) int ret; timeout = GNUNET_TIME_UNIT_FOREVER_REL; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; - GNUNET_log_setup ("gnunet-gns", "WARNING", NULL); ret = GNUNET_PROGRAM_run (argc, argv, @@ -401,7 +396,6 @@ main (int argc, char *const *argv) options, &run, NULL); - GNUNET_free_nz ((void *) argv); if (GNUNET_OK != ret) return 1; return global_ret; diff --git a/src/cli/hello/gnunet-hello.c b/src/cli/hello/gnunet-hello.c @@ -427,8 +427,6 @@ main (int argc, char *const *argv) &print_hellos), GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; res = GNUNET_PROGRAM_run (argc, argv, "gnunet-hello", @@ -438,7 +436,6 @@ main (int argc, char *const *argv) &run, NULL); - GNUNET_free_nz ((void *) argv); if (GNUNET_OK == res) return ret; return 1; diff --git a/src/cli/identity/gnunet-identity.c b/src/cli/identity/gnunet-identity.c @@ -615,10 +615,6 @@ main (int argc, char *const *argv) }; int res; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 4; global_ret = TIMEOUT_STATUS_CODE; /* timeout */ res = GNUNET_PROGRAM_run (argc, argv, @@ -627,7 +623,6 @@ main (int argc, char *const *argv) options, &run, NULL); - GNUNET_free_nz ((void *) argv); if (GNUNET_OK != res) return 3; diff --git a/src/cli/namecache/gnunet-namecache.c b/src/cli/namecache/gnunet-namecache.c @@ -222,9 +222,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - GNUNET_log_setup ("gnunet-namecache", "WARNING", NULL); if (GNUNET_OK != GNUNET_PROGRAM_run (argc, argv, @@ -234,10 +231,8 @@ main (int argc, char *const *argv) &run, NULL)) { - GNUNET_free_nz ((void *) argv); return 1; } - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/namestore/gnunet-namestore-dbtool.c b/src/cli/namestore/gnunet-namestore-dbtool.c @@ -173,11 +173,6 @@ main (int argc, char *const *argv) }; int lret; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; - GNUNET_log_setup ("gnunet-namestore-dbtool", "WARNING", NULL); @@ -191,9 +186,7 @@ main (int argc, char *const *argv) &run, NULL))) { - GNUNET_free_nz ((void *) argv); return lret; } - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/namestore/gnunet-namestore-zonefile.c b/src/cli/namestore/gnunet-namestore-zonefile.c @@ -707,9 +707,6 @@ main (int argc, char *const *argv) }; int lret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - GNUNET_log_setup ("gnunet-namestore-dbtool", "WARNING", NULL); if (GNUNET_OK != (lret = GNUNET_PROGRAM_run (argc, @@ -721,9 +718,7 @@ main (int argc, char *const *argv) &run, NULL))) { - GNUNET_free_nz ((void *) argv); return lret; } - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/namestore/gnunet-namestore.c b/src/cli/namestore/gnunet-namestore.c @@ -2259,9 +2259,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - is_public = -1; is_shadow = -1; is_maintenance = -1; @@ -2275,12 +2272,10 @@ main (int argc, char *const *argv) &run, NULL))) { - GNUNET_free_nz ((void *) argv); // FIXME // GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey); return lret; } - GNUNET_free_nz ((void *) argv); // FIXME // GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey); return ret; diff --git a/src/cli/namestore/gnunet-zoneimport.c b/src/cli/namestore/gnunet-zoneimport.c @@ -1853,8 +1853,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; if (GNUNET_OK != (ret = GNUNET_PROGRAM_run (argc, argv, "gnunet-zoneimport", @@ -1863,7 +1861,6 @@ main (int argc, char *const *argv) &run, NULL))) return ret; - GNUNET_free_nz ((void *) argv); fprintf (stderr, "Rejected %u names, had %u cached, did %u lookups, stored %u record sets\n" "Found %u records, %u lookups failed, %u/%u pending on shutdown\n", diff --git a/src/cli/nat-auto/gnunet-nat-auto.c b/src/cli/nat-auto/gnunet-nat-auto.c @@ -346,8 +346,6 @@ main (int argc, char *const argv[]) &write_cfg), GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; if (GNUNET_OK != GNUNET_PROGRAM_run (argc, argv, @@ -359,7 +357,6 @@ main (int argc, char *const argv[]) { global_ret = 1; } - GNUNET_free_nz ((void *) argv); return global_ret; } diff --git a/src/cli/nat/gnunet-nat.c b/src/cli/nat/gnunet-nat.c @@ -455,8 +455,6 @@ main (int argc, char *const argv[]) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; if (GNUNET_OK != GNUNET_PROGRAM_run (argc, argv, @@ -468,7 +466,6 @@ main (int argc, char *const argv[]) { global_ret = 1; } - GNUNET_free_nz ((void *) argv); return global_ret; } diff --git a/src/cli/revocation/gnunet-revocation.c b/src/cli/revocation/gnunet-revocation.c @@ -561,9 +561,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-revocation", @@ -573,7 +570,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/statistics/gnunet-statistics.c b/src/cli/statistics/gnunet-statistics.c @@ -866,10 +866,6 @@ main (int argc, char *const *argv) remote_port = 0; remote_host = NULL; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, @@ -886,7 +882,6 @@ main (int argc, char *const *argv) num_nodes, 0); GNUNET_free (remote_host); - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/util/gnunet-base32.c b/src/cli/util/gnunet-base32.c @@ -57,10 +57,6 @@ main (int argc, char *out; size_t out_size; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; ret = GNUNET_GETOPT_run ("gnunet-base32", options, argc, @@ -147,7 +143,6 @@ main (int argc, } } GNUNET_free (out); - GNUNET_free_nz ((void *) argv); return 0; } diff --git a/src/cli/util/gnunet-config.c b/src/cli/util/gnunet-config.c @@ -140,10 +140,6 @@ main (int argc, }; int iret; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return EXIT_FAILURE; if ( (NULL != pd->config_file) && (NULL != pd->user_config_file) ) cfgfile = GNUNET_CONFIGURATION_default_filename (); @@ -202,7 +198,6 @@ main (int argc, GNUNET_free (prefixdir); GNUNET_free (libdir); GNUNET_free (cfgfile); - GNUNET_free_nz ((void *) argv); return 0; } if (NULL != backend_check) @@ -216,7 +211,6 @@ main (int argc, GNUNET_PLUGIN_test (name)) ? 0 : 77; GNUNET_free (name); GNUNET_free (cfgfile); - GNUNET_free_nz ((void *) argv); return iret; } @@ -234,7 +228,6 @@ main (int argc, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Failed to load default configuration, exiting ...\n")); - GNUNET_free_nz ((void *) argv); GNUNET_CONFIGURATION_destroy (cfg); GNUNET_free (cfgfile); return EXIT_FAILURE; @@ -247,7 +240,6 @@ main (int argc, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Failed to parse configuration, exiting ...\n")); - GNUNET_free_nz ((void *) argv); GNUNET_CONFIGURATION_destroy (cfg); GNUNET_free (cfgfile); return EXIT_FAILURE; @@ -261,7 +253,6 @@ main (int argc, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Unreadable configuration file `%s', exiting ...\n"), cfgfile); - GNUNET_free_nz ((void *) argv); GNUNET_CONFIGURATION_destroy (cfg); GNUNET_free (cfgfile); return EXIT_FAILURE; @@ -276,7 +267,6 @@ main (int argc, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Malformed configuration file `%s', exiting ...\n"), cfgfile); - GNUNET_free_nz ((void *) argv); GNUNET_CONFIGURATION_destroy (cfg); GNUNET_free (cfgfile); return EXIT_FAILURE; @@ -286,7 +276,6 @@ main (int argc, &argv[iret], cfgfile, cfg); - GNUNET_free_nz ((void *) argv); GNUNET_CONFIGURATION_config_settings_free (&cs); GNUNET_CONFIGURATION_destroy (cfg); } diff --git a/src/cli/util/gnunet-ecc.c b/src/cli/util/gnunet-ecc.c @@ -494,9 +494,6 @@ main (int argc, char *const *argv) int ret; list_keys_count = UINT32_MAX; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, @@ -508,7 +505,6 @@ main (int argc, char *const *argv) NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/util/gnunet-resolver.c b/src/cli/util/gnunet-resolver.c @@ -172,18 +172,12 @@ main (int argc, char *const *argv) }; int ret; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]", gettext_noop ("Use built-in GNUnet stub resolver"), options, &run, NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/cli/util/gnunet-scrypt.c b/src/cli/util/gnunet-scrypt.c @@ -302,9 +302,6 @@ main (int argc, char *const *argv) }; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, @@ -316,7 +313,6 @@ main (int argc, char *const *argv) NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); GNUNET_free (pwfn); return ret; } diff --git a/src/cli/util/gnunet-uri.c b/src/cli/util/gnunet-uri.c @@ -166,8 +166,6 @@ main (int argc, char *const *argv) struct GNUNET_SIGNAL_Context *shc_chld; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE); GNUNET_assert (sigpipe != NULL); shc_chld = @@ -184,7 +182,6 @@ main (int argc, char *const *argv) shc_chld = NULL; GNUNET_DISK_pipe_close (sigpipe); sigpipe = NULL; - GNUNET_free_nz ((void *) argv); return ((GNUNET_OK == ret) && (0 == exit_code)) ? 0 : 1; } diff --git a/src/cli/vpn/gnunet-vpn.c b/src/cli/vpn/gnunet-vpn.c @@ -343,9 +343,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, @@ -356,7 +353,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/contrib/cli/template/gnunet-template.c b/src/contrib/cli/template/gnunet-template.c @@ -66,9 +66,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-template", @@ -78,7 +75,6 @@ main (int argc, char *const *argv) NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/contrib/service/abd/gnunet-abd.c b/src/contrib/service/abd/gnunet-abd.c @@ -1093,9 +1093,6 @@ main (int argc, char *const *argv) timeout = GNUNET_TIME_UNIT_FOREVER_REL; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - GNUNET_log_setup ("gnunet-abd", "WARNING", NULL); if (GNUNET_OK != GNUNET_PROGRAM_run (argc, argv, @@ -1105,7 +1102,6 @@ main (int argc, char *const *argv) &run, NULL)) ret = 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/contrib/service/conversation/gnunet-conversation-test.c b/src/contrib/service/conversation/gnunet-conversation-test.c @@ -245,11 +245,6 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-conversation-test", @@ -257,7 +252,6 @@ main (int argc, options, &run, NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/contrib/service/conversation/gnunet-conversation.c b/src/contrib/service/conversation/gnunet-conversation.c @@ -1208,8 +1208,6 @@ main (int argc, char *const *argv) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl"); stdin_fh = GNUNET_DISK_get_handle_from_int_fd (0); - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; ret = GNUNET_PROGRAM_run (argc, argv, @@ -1219,7 +1217,6 @@ main (int argc, char *const *argv) options, &run, NULL); - GNUNET_free_nz ((void *) argv); if (NULL != cfg) { GNUNET_CONFIGURATION_destroy (cfg); diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h @@ -145,9 +145,6 @@ GNUNET_PROGRAM_monolith_main (int argc, struct GNUNET_GETOPT_CommandLineOption options[] = { \ GNUNET_GETOPT_OPTION_END \ }; \ - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, \ - &argv)) \ - return 2; \ ret = GNUNET_PROGRAM_run (argc, \ argv, \ daemon_name, \ @@ -155,7 +152,6 @@ GNUNET_PROGRAM_monolith_main (int argc, options, \ init_cb, \ NULL); \ - GNUNET_free_nz ((void*) argv); \ return ret; \ } #else diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h @@ -648,25 +648,6 @@ GNUNET_STRINGS_to_address_ip (const char *addr, /** - * Returns utf-8 encoded arguments. Does nothing (returns a copy of - * @a argc and @a argv) on any platform other than W32. Returned @a - * argv has `u8argv[u8argc] == NULL`. Returned @a argv is a single - * memory block, and can be freed with a single GNUNET_free() call. - * - * @param argc argc (as given by main()) - * @param argv argv (as given by main()) - * @param u8argc a location to store new argc in (though it's th same as argc) - * @param u8argv a location to store new argv in - * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure - */ -enum GNUNET_GenericReturnValue -GNUNET_STRINGS_get_utf8_args (int argc, - char *const *argv, - int *u8argc, - char *const **u8argv); - - -/** * Like strlcpy but portable. The given string @a src is copied in full length * (until its null byte). The destination buffer is guaranteed to be * null-terminated. diff --git a/src/lib/util/strings.c b/src/lib/util/strings.c @@ -1216,52 +1216,6 @@ GNUNET_STRINGS_parse_socket_addr (const char *addr, } -/** - * Makes a copy of argv that consists of a single memory chunk that can be - * freed with a single call to GNUNET_free(); - */ -static char *const * -_make_continuous_arg_copy (int argc, - char *const *argv) -{ - size_t argvsize = 0; - char **new_argv; - char *p; - - for (int i = 0; i < argc; i++) - { - size_t ail = strlen (argv[i]); - - GNUNET_assert (SIZE_MAX - 1 - sizeof (char *) > argvsize); - GNUNET_assert (SIZE_MAX - ail > argvsize + 1 + sizeof (char*)); - argvsize += strlen (argv[i]) + 1 + sizeof(char *); - } - new_argv = GNUNET_malloc (argvsize + sizeof(char *)); - p = (char *) &new_argv[argc + 1]; - for (int i = 0; i < argc; i++) - { - new_argv[i] = p; - strcpy (p, argv[i]); - p += strlen (argv[i]) + 1; - } - new_argv[argc] = NULL; - return (char *const *) new_argv; -} - - -enum GNUNET_GenericReturnValue -GNUNET_STRINGS_get_utf8_args (int argc, - char *const *argv, - int *u8argc, - char *const **u8argv) -{ - char *const *new_argv = - (char *const *) _make_continuous_arg_copy (argc, argv); - *u8argv = new_argv; - *u8argc = argc; - return GNUNET_OK; -} - /** * Parse the given port policy. The format is diff --git a/src/service/dns/gnunet-dns-monitor.c b/src/service/dns/gnunet-dns-monitor.c @@ -396,14 +396,11 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-dns-monitor", gettext_noop ("Monitor DNS queries."), options, &run, NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/dns/gnunet-dns-redirector.c b/src/service/dns/gnunet-dns-redirector.c @@ -250,16 +250,12 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-dns-redirector", gettext_noop ("Change DNS replies to point elsewhere."), options, &run, NULL)) ? ret : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/exit/gnunet-daemon-exit.c b/src/service/exit/gnunet-daemon-exit.c @@ -4113,13 +4113,6 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, - argv, - &argc, - &argv)) - return 2; - return (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, diff --git a/src/service/gns/gnunet-dns2gns.c b/src/service/gns/gnunet-dns2gns.c @@ -1001,10 +1001,6 @@ main (int argc, }; int ret; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; GNUNET_log_setup ("gnunet-dns2gns", "WARNING", NULL); @@ -1015,7 +1011,6 @@ main (int argc, _ ("GNUnet DNS-to-GNS proxy (a DNS server)"), options, &run, NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/gns/gnunet-gns-proxy.c b/src/service/gns/gnunet-gns-proxy.c @@ -3882,10 +3882,6 @@ main (int argc, "</head><body>cURL fail</body></html>"; int ret; - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; GNUNET_log_setup ("gnunet-gns-proxy", "WARNING", NULL); @@ -3902,7 +3898,6 @@ main (int argc, options, &run, NULL)) ? 0 : 1; MHD_destroy_response (curl_failure_response); - GNUNET_free_nz ((char *) argv); return ret; } diff --git a/src/service/hostlist/gnunet-daemon-hostlist.c b/src/service/hostlist/gnunet-daemon-hostlist.c @@ -382,9 +382,6 @@ main (int argc, char *const *argv) int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - GNUNET_log_setup ("hostlist", "WARNING", NULL); ret = (GNUNET_OK == @@ -393,7 +390,6 @@ main (int argc, char *const *argv) _ ("GNUnet hostlist server and client"), options, &run, NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/pt/gnunet-daemon-pt.c b/src/service/pt/gnunet-daemon-pt.c @@ -1301,11 +1301,6 @@ main (int argc, }; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, - argv, - &argc, - &argv)) - return 2; ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, @@ -1317,7 +1312,6 @@ main (int argc, NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/regex/gnunet-daemon-regexprofiler.c b/src/service/regex/gnunet-daemon-regexprofiler.c @@ -375,8 +375,6 @@ main (int argc, char *const *argv) GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; return (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "regexprofiler", gettext_noop diff --git a/src/service/topology/gnunet-daemon-topology.c b/src/service/topology/gnunet-daemon-topology.c @@ -1082,9 +1082,6 @@ main (int argc, char *const *argv) }; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-daemon-topology", @@ -1094,7 +1091,6 @@ main (int argc, char *const *argv) NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/transport/gnunet-communicator-http3.c b/src/service/transport/gnunet-communicator-http3.c @@ -3924,9 +3924,6 @@ main (int argc, char *const *argv) GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, "transport", "Starting http3 communicator\n"); - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, @@ -3937,7 +3934,6 @@ main (int argc, char *const *argv) NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/transport/gnunet-communicator-quic.c b/src/service/transport/gnunet-communicator-quic.c @@ -1727,9 +1727,6 @@ main (int argc, char *const *argv) GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, "transport", "Starting quic communicator\n"); - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-communicator-quic", @@ -1739,6 +1736,5 @@ main (int argc, char *const *argv) NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/transport/gnunet-communicator-tcp.c b/src/service/transport/gnunet-communicator-tcp.c @@ -4218,10 +4218,6 @@ main (int argc, char *const *argv) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting tcp communicator\n"); - if (GNUNET_OK != - GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) - return 2; ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, @@ -4233,7 +4229,6 @@ main (int argc, char *const *argv) NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; } diff --git a/src/service/transport/gnunet-communicator-udp.c b/src/service/transport/gnunet-communicator-udp.c @@ -3931,6 +3931,7 @@ run (void *cls, } -GNUNET_DAEMON_MAIN ("gnunet-communicator-udp", _ ("GNUnet UDP communicator"), & - run) +GNUNET_DAEMON_MAIN ("gnunet-communicator-udp", + _ ("GNUnet UDP communicator"), + &run) /* end of gnunet-communicator-udp.c */ diff --git a/src/service/transport/gnunet-communicator-unix.c b/src/service/transport/gnunet-communicator-unix.c @@ -1128,9 +1128,6 @@ main (int argc, char *const *argv) }; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) - return 2; - ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, @@ -1141,7 +1138,6 @@ main (int argc, char *const *argv) NULL)) ? 0 : 1; - GNUNET_free_nz ((void *) argv); return ret; }