diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-25 20:05:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-25 20:05:32 +0000 |
commit | 1f1cee05703360688308f3a6cfab40673b891989 (patch) | |
tree | 7c4e3ba7799f0d1339279c12431fbd163093ca2a /src/util | |
parent | 1d670b00843948c8e23ef7020e08a91852798c6d (diff) | |
download | gnunet-1f1cee05703360688308f3a6cfab40673b891989.tar.gz gnunet-1f1cee05703360688308f3a6cfab40673b891989.zip |
-always check that WE can execute
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/os_installation.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/util/os_installation.c b/src/util/os_installation.c index c0b7c8583..ee4257ca5 100644 --- a/src/util/os_installation.c +++ b/src/util/os_installation.c | |||
@@ -487,6 +487,13 @@ GNUNET_OS_check_helper_binary (const char *binary) | |||
487 | binary); | 487 | binary); |
488 | return GNUNET_SYSERR; | 488 | return GNUNET_SYSERR; |
489 | } | 489 | } |
490 | if (0 != ACCESS (p, X_OK)) | ||
491 | { | ||
492 | LOG (GNUNET_ERROR_TYPE_WARNING, _("access (%s, X_OK) failed: %s\n"), p, | ||
493 | STRERROR (errno)); | ||
494 | GNUNET_free (p); | ||
495 | return GNUNET_SYSERR; | ||
496 | } | ||
490 | if (0 != STAT (p, &statbuf)) | 497 | if (0 != STAT (p, &statbuf)) |
491 | { | 498 | { |
492 | LOG (GNUNET_ERROR_TYPE_WARNING, _("stat (%s) failed: %s\n"), p, | 499 | LOG (GNUNET_ERROR_TYPE_WARNING, _("stat (%s) failed: %s\n"), p, |
@@ -500,11 +507,6 @@ GNUNET_OS_check_helper_binary (const char *binary) | |||
500 | GNUNET_free (p); | 507 | GNUNET_free (p); |
501 | return GNUNET_YES; | 508 | return GNUNET_YES; |
502 | } | 509 | } |
503 | if (0 == ACCESS (p, X_OK)) | ||
504 | { | ||
505 | GNUNET_free (p); | ||
506 | return GNUNET_NO; | ||
507 | } | ||
508 | GNUNET_free (p); | 510 | GNUNET_free (p); |
509 | return GNUNET_SYSERR; | 511 | return GNUNET_SYSERR; |
510 | #else | 512 | #else |