#include "gnunet_scheduler_lib.h"
#include <gcrypt.h>
+#if HAVE_ARGZ_H
+#include <argz.h>
+#else
+#include "program_lib_strnlen.c"
+#include "program_lib_strndup.c"
+#include "program_lib_mempcpy.c"
+#include "program_lib_argz.c"
+#endif
+
/**
* Context for the command.
*/
* @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 (c1->shortName) > toupper (c2->shortName))
return 1;
if (toupper (c1->shortName) < toupper (c2->shortName))
struct CommandContext cc;
char *path;
char *loglev;
+ char *logfile;
int ret;
unsigned int cnt;
struct GNUNET_CONFIGURATION_Handle *cfg;
GNUNET_GETOPT_OPTION_CFG_FILE (&cc.cfgfile),
GNUNET_GETOPT_OPTION_HELP (binaryHelp),
GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
+ GNUNET_GETOPT_OPTION_LOGFILE (&logfile),
GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION)
};
struct GNUNET_GETOPT_CommandLineOption *allopts;
+ const char *gargs;
+ logfile = NULL;
+ gargs = getenv ("GNUNET_ARGS");
+ if (gargs != NULL)
+ {
+ char *gargz;
+ size_t gargl;
+ char **gargv;
+ int i;
+
+ argz_create_sep (gargs, ' ', &gargz, &gargl);
+ for (i=0;i<argc;i++)
+ argz_insert (&gargz, &gargl, gargz, argv[i]);
+ gargv = GNUNET_malloc (sizeof (char*) * (gargl+1));
+ argz_extract (gargz, gargl, gargv);
+ argc = argz_count (gargz, gargl);
+ free (gargz);
+ argv = (char *const *) gargv;
+ }
memset (&cc, 0, sizeof (cc));
loglev = NULL;
cc.task = task;
qsort (allopts, cnt, sizeof (struct GNUNET_GETOPT_CommandLineOption),
&cmd_sorter);
loglev = GNUNET_strdup ("WARNING");
- if ((-1 == (ret = GNUNET_GETOPT_run (binaryName,
+ cc.cfgfile = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
+ if ((-1 == (ret = GNUNET_GETOPT_run (binaryName,
allopts,
(unsigned int) argc, argv))) ||
((GNUNET_OK !=
GNUNET_log_setup (binaryName,
loglev,
- NULL)) ||
+ logfile)) ||
(GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile))))
{