[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9543 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9543 - gnunet/src/util |
Date: |
Mon, 16 Nov 2009 01:32:27 -0700 |
Author: grothoff
Date: 2009-11-16 01:32:27 -0700 (Mon, 16 Nov 2009)
New Revision: 9543
Modified:
gnunet/src/util/Makefile.am
gnunet/src/util/program.c
gnunet/src/util/pseudonym.c
Log:
bugfix
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2009-11-16 08:27:41 UTC (rev 9542)
+++ gnunet/src/util/Makefile.am 2009-11-16 08:32:27 UTC (rev 9543)
@@ -362,6 +362,7 @@
EXTRA_DIST = \
+ program_lib_argz.c \
test_configuration_data.conf \
test_container_meta_data_image.jpg \
test_program_data.conf \
Modified: gnunet/src/util/program.c
===================================================================
--- gnunet/src/util/program.c 2009-11-16 08:27:41 UTC (rev 9542)
+++ gnunet/src/util/program.c 2009-11-16 08:32:27 UTC (rev 9543)
@@ -35,6 +35,12 @@
#include "gnunet_scheduler_lib.h"
#include <gcrypt.h>
+#if HAVE_ARGZ_H
+#include <argz.h>
+#else
+#include "program_lib_argz.c"
+#endif
+
/**
* Context for the command.
*/
@@ -139,7 +145,25 @@
GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION)
};
struct GNUNET_GETOPT_CommandLineOption *allopts;
+ const char *gargs;
+ 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;
Modified: gnunet/src/util/pseudonym.c
===================================================================
--- gnunet/src/util/pseudonym.c 2009-11-16 08:27:41 UTC (rev 9542)
+++ gnunet/src/util/pseudonym.c 2009-11-16 08:32:27 UTC (rev 9543)
@@ -409,7 +409,7 @@
int rating;
struct GNUNET_CONTAINER_MetaData *meta;
const char *fn;
- const char *str = "not null";
+ char *str;
if (strlen (fullname) < sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded))
return GNUNET_OK;
@@ -421,8 +421,10 @@
ret = GNUNET_OK;
if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (fn, &id))
return GNUNET_OK; /* invalid name */
+ str = NULL;
if (GNUNET_OK != read_info (c->cfg, &id, &meta, &rating, &str))
return GNUNET_OK; /* ignore entry */
+ GNUNET_free_non_null (str);
if (c->iterator != NULL)
ret = c->iterator (c->closure, &id, meta, rating);
GNUNET_CONTAINER_meta_data_destroy (meta);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9543 - gnunet/src/util,
gnunet <=