#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.
*/
{
__const struct GNUNET_GETOPT_CommandLineOption *c1 = a1;
__const struct GNUNET_GETOPT_CommandLineOption *c2 = a2;
- if (toupper (c1->shortName) > toupper (c2->shortName))
+ if (toupper ( (unsigned char) c1->shortName) > toupper ( (unsigned char) c2->shortName))
return 1;
- if (toupper (c1->shortName) < toupper (c2->shortName))
+ if (toupper ( (unsigned char) c1->shortName) < toupper ( (unsigned char) c2->shortName))
return -1;
if (c1->shortName > c2->shortName)
return 1;
gargs = getenv ("GNUNET_ARGS");
if (gargs != NULL)
{
- char *gargz;
- size_t gargl;
char **gargv;
+ unsigned int gargc;
int i;
-
- argz_create_sep (gargs, ' ', &gargz, &gargl);
+ char *tok;
+ char *cargs;
+
+ gargv = NULL;
+ gargc = 0;
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);
+ GNUNET_array_append (gargv, gargc, GNUNET_strdup (argv[i]));
+ cargs = GNUNET_strdup (gargs);
+ tok = strtok (cargs, " ");
+ while (NULL != tok)
+ {
+ GNUNET_array_append (gargv, gargc, GNUNET_strdup (tok));
+ tok = strtok (NULL, " ");
+ }
+ GNUNET_free (cargs);
+ GNUNET_array_append (gargv, gargc, NULL);
argv = (char *const *) gargv;
+ argc = gargc - 1;
}
memset (&cc, 0, sizeof (cc));
loglev = NULL;
(GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cc.cfgfile))))
{
+ GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free_non_null (cc.cfgfile);
GNUNET_free (loglev);
GNUNET_free (allopts);