X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fprogram.c;h=3f8708f7dc19b1741946c1efb8220ee2de4a7d6a;hb=007c852f2e43e658cb2581a62c03cd0ccbfd08f4;hp=f1e95477da7e446b76a350969bea79829f4675fa;hpb=5746309cb4be2073d550ad7a6885e918631dbc38;p=oweals%2Fgnunet.git diff --git a/src/util/program.c b/src/util/program.c index f1e95477d..3f8708f7d 100644 --- a/src/util/program.c +++ b/src/util/program.c @@ -4,12 +4,12 @@ GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPROSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License @@ -25,17 +25,15 @@ */ #include "platform.h" -#include "gnunet_common.h" -#include "gnunet_configuration_lib.h" -#include "gnunet_crypto_lib.h" -#include "gnunet_directories.h" -#include "gnunet_getopt_lib.h" -#include "gnunet_os_lib.h" -#include "gnunet_program_lib.h" +#include "gnunet_util_lib.h" #include "gnunet_resolver_service.h" -#include "gnunet_scheduler_lib.h" +#include "gnunet_constants.h" #include +#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) + +#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename) + /** * Context for the command. */ @@ -68,6 +66,12 @@ struct CommandContext }; +int +GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg); + +int +GNUNET_SPEEDUP_stop_ (void); + /** * Initial task called by the scheduler for each @@ -78,6 +82,9 @@ program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct CommandContext *cc = cls; + if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) + return; + GNUNET_SPEEDUP_start_(cc->cfg); GNUNET_RESOLVER_connect (cc->cfg); cc->task (cc->task_cls, cc->args, cc->cfgfile, cc->cfg); } @@ -91,10 +98,10 @@ program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @param a2 second command line option */ static int -cmd_sorter (__const void *a1, __const void *a2) +cmd_sorter (const void *a1, const void *a2) { - __const struct GNUNET_GETOPT_CommandLineOption *c1 = a1; - __const struct GNUNET_GETOPT_CommandLineOption *c2 = a2; + const struct GNUNET_GETOPT_CommandLineOption *c1 = a1; + const struct GNUNET_GETOPT_CommandLineOption *c2 = a2; if (toupper ((unsigned char) c1->shortName) > toupper ((unsigned char) c2->shortName)) @@ -121,18 +128,25 @@ cmd_sorter (__const void *a1, __const void *a2) * @param options command line options * @param task main function to run * @param task_cls closure for task + * @param run_without_scheduler GNUNET_NO start the scheduler, GNUNET_YES do not + * start the scheduler just run the main task * @return GNUNET_SYSERR on error, GNUNET_OK on success */ int -GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, +GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName, const char *binaryHelp, const struct GNUNET_GETOPT_CommandLineOption *options, - GNUNET_PROGRAM_Main task, void *task_cls) + GNUNET_PROGRAM_Main task, void *task_cls, + int run_without_scheduler) { struct CommandContext cc; +#if ENABLE_NLS char *path; +#endif char *loglev; char *logfile; + char *cfg_fn; + const char *xdg; int ret; unsigned int cnt; unsigned long long skew_offset; @@ -145,7 +159,7 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, GNUNET_GETOPT_OPTION_HELP (binaryHelp), GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev), GNUNET_GETOPT_OPTION_LOGFILE (&logfile), - GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION) + GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION " " VCS_VERSION) }; struct GNUNET_GETOPT_CommandLineOption *allopts; const char *gargs; @@ -183,7 +197,6 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, cc.task = task; cc.task_cls = task_cls; cc.cfg = cfg = GNUNET_CONFIGURATION_create (); - /* prepare */ #if ENABLE_NLS setlocale (LC_ALL, ""); @@ -210,23 +223,59 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, cnt += sizeof (defoptions) / sizeof (struct GNUNET_GETOPT_CommandLineOption); qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption), &cmd_sorter); - loglev = GNUNET_strdup ("WARNING"); - cc.cfgfile = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE); + loglev = NULL; + xdg = getenv ("XDG_CONFIG_HOME"); + if (NULL != xdg) + GNUNET_asprintf (&cfg_fn, + "%s%s%s", + xdg, + DIR_SEPARATOR_STR, + "gnunet.conf"); + else + cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE); lpfx = GNUNET_strdup (binaryName); if (NULL != (spc = strstr (lpfx, " "))) *spc = '\0'; - if ((-1 == - (ret = - GNUNET_GETOPT_run (binaryName, allopts, (unsigned int) argc, argv))) || - ((GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile)) || - (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile)))) + ret = GNUNET_GETOPT_run (binaryName, allopts, (unsigned int) argc, argv); + if ((GNUNET_OK > ret) || + (GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile))) { GNUNET_CONFIGURATION_destroy (cfg); GNUNET_free_non_null (cc.cfgfile); - GNUNET_free (loglev); + GNUNET_free_non_null (loglev); + GNUNET_free_non_null (logfile); + GNUNET_free (cfg_fn); GNUNET_free (allopts); GNUNET_free (lpfx); - return GNUNET_SYSERR; + return (ret == GNUNET_SYSERR) ? GNUNET_SYSERR : GNUNET_OK; + } + if (NULL == cc.cfgfile) + cc.cfgfile = GNUNET_strdup (cfg_fn); + if (GNUNET_YES == + GNUNET_DISK_file_test (cc.cfgfile)) + { + if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cc.cfgfile)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Malformed configuration file `%s', exit ...\n"), + cc.cfgfile); + GNUNET_free (cc.cfgfile); + return GNUNET_SYSERR; + } + } + else + { + if (0 != strcmp (cc.cfgfile, cfg_fn)) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Could not access configuration file `%s'\n"), + cc.cfgfile); + if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, NULL)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Malformed configuration, exit ...\n")); + GNUNET_free (cc.cfgfile); + return GNUNET_SYSERR; + } } GNUNET_free (allopts); GNUNET_free (lpfx); @@ -242,14 +291,47 @@ GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, } /* run */ cc.args = &argv[ret]; - GNUNET_SCHEDULER_run (&program_main, &cc); - + if (GNUNET_NO == run_without_scheduler) + { + GNUNET_SCHEDULER_run (&program_main, &cc); + } + else + { + GNUNET_RESOLVER_connect (cc.cfg); + cc.task (cc.task_cls, cc.args, cc.cfgfile, cc.cfg); + } /* clean up */ + GNUNET_SPEEDUP_stop_ (); GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_free_non_null (cc.cfgfile); - GNUNET_free (loglev); + GNUNET_free (cc.cfgfile); + GNUNET_free (cfg_fn); + GNUNET_free_non_null (loglev); + GNUNET_free_non_null (logfile); return GNUNET_OK; } +/** + * Run a standard GNUnet command startup sequence (initialize loggers + * and configuration, parse options). + * + * @param argc number of command line arguments + * @param argv command line arguments + * @param binaryName our expected name + * @param binaryHelp help text for the program + * @param options command line options + * @param task main function to run + * @param task_cls closure for @a task + * @return #GNUNET_SYSERR on error, #GNUNET_OK on success + */ +int +GNUNET_PROGRAM_run (int argc, char *const *argv, const char *binaryName, + const char *binaryHelp, + const struct GNUNET_GETOPT_CommandLineOption *options, + GNUNET_PROGRAM_Main task, void *task_cls) +{ + return GNUNET_PROGRAM_run2 (argc, argv, binaryName, binaryHelp, options, task, task_cls, GNUNET_NO); +} + + /* end of program.c */