diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-11-05 10:44:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-11-05 10:44:29 +0000 |
commit | 0d5c03f33e0162b2a078d73ba693f397898022cb (patch) | |
tree | 2d74bf408bfd55f2736f4dac9ff754f061a51f2c /src/arm/arm_api.c | |
parent | 0f8f8219d92f8f000aa662aa6beb3749f71f3486 (diff) | |
download | gnunet-0d5c03f33e0162b2a078d73ba693f397898022cb.tar.gz gnunet-0d5c03f33e0162b2a078d73ba693f397898022cb.zip |
-fix use of PREFIX with libexec
Diffstat (limited to 'src/arm/arm_api.c')
-rw-r--r-- | src/arm/arm_api.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 15563e933..517938d8c 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -316,6 +316,7 @@ arm_service_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
316 | { | 316 | { |
317 | struct RequestContext *pos = cls; | 317 | struct RequestContext *pos = cls; |
318 | struct GNUNET_OS_Process *proc; | 318 | struct GNUNET_OS_Process *proc; |
319 | char *cbinary; | ||
319 | char *binary; | 320 | char *binary; |
320 | char *config; | 321 | char *config; |
321 | char *loprefix; | 322 | char *loprefix; |
@@ -344,7 +345,7 @@ arm_service_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
344 | lopostfix = GNUNET_strdup (""); | 345 | lopostfix = GNUNET_strdup (""); |
345 | if (GNUNET_OK != | 346 | if (GNUNET_OK != |
346 | GNUNET_CONFIGURATION_get_value_string (pos->h->cfg, "arm", "BINARY", | 347 | GNUNET_CONFIGURATION_get_value_string (pos->h->cfg, "arm", "BINARY", |
347 | &binary)) | 348 | &cbinary)) |
348 | { | 349 | { |
349 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, | 350 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, |
350 | "arm", "BINARY"); | 351 | "arm", "BINARY"); |
@@ -363,12 +364,14 @@ arm_service_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
363 | "arm", "CONFIG"); | 364 | "arm", "CONFIG"); |
364 | if (pos->callback != NULL) | 365 | if (pos->callback != NULL) |
365 | pos->callback (pos->cls, GNUNET_ARM_PROCESS_UNKNOWN); | 366 | pos->callback (pos->cls, GNUNET_ARM_PROCESS_UNKNOWN); |
366 | GNUNET_free (binary); | 367 | GNUNET_free (cbinary); |
367 | GNUNET_free (pos); | 368 | GNUNET_free (pos); |
368 | GNUNET_free (loprefix); | 369 | GNUNET_free (loprefix); |
369 | GNUNET_free (lopostfix); | 370 | GNUNET_free (lopostfix); |
370 | return; | 371 | return; |
371 | } | 372 | } |
373 | binary = GNUNET_OS_get_libexec_binary_path (cbinary); | ||
374 | GNUNET_free (cbinary); | ||
372 | if ((GNUNET_YES == | 375 | if ((GNUNET_YES == |
373 | GNUNET_CONFIGURATION_have_value (pos->h->cfg, "TESTING", "WEAKRANDOM")) | 376 | GNUNET_CONFIGURATION_have_value (pos->h->cfg, "TESTING", "WEAKRANDOM")) |
374 | && (GNUNET_YES == | 377 | && (GNUNET_YES == |