[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32119 - gnunet/contrib gnunet/po gnunet/src/arm gnunet/src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r32119 - gnunet/contrib gnunet/po gnunet/src/arm gnunet/src/ats gnunet/src/ats-tests gnunet/src/consensus gnunet/src/conversation gnunet/src/core gnunet/src/datacache gnunet/src/datastore gnunet/src/dht gnunet/src/dns gnunet/src/dv gnunet/src/env gnunet/src/experimentation gnunet/src/fragmentation gnunet/src/fs gnunet/src/gns gnunet/src/gnsrecord gnunet/src/hello gnunet/src/hostlist gnunet/src/identity gnunet/src/include gnunet/src/integration-tests gnunet/src/mesh gnunet/src/multicast gnunet/src/namecache gnunet/src/namestore gnunet/src/nat gnunet/src/nse gnunet/src/peerinfo gnunet/src/peerinfo-tool gnunet/src/psyc gnunet/src/psycstore gnunet/src/pt gnunet/src/regex gnunet/src/revocation gnunet/src/scalarproduct gnunet/src/secretsharing gnunet/src/set gnunet/src/statistics gnunet/src/template gnunet/src/testbed gnunet/src/testing gnunet/src/topology gnunet/src/transport gnunet/src/tun gnunet/src/util gnunet-gtk/contrib gnunet-gtk/src/lib |
|
Date: |
Thu, 30 Jan 2014 15:47:20 +0100 |
Author: grothoff
Date: 2014-01-30 15:47:20 +0100 (Thu, 30 Jan 2014)
New Revision: 32119
Modified:
gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
gnunet-gtk/src/lib/os_installation.c
gnunet/contrib/Makefile.am
gnunet/po/POTFILES.in
gnunet/src/arm/Makefile.am
gnunet/src/ats-tests/Makefile.am
gnunet/src/ats/Makefile.am
gnunet/src/consensus/Makefile.am
gnunet/src/conversation/Makefile.am
gnunet/src/core/Makefile.am
gnunet/src/datacache/Makefile.am
gnunet/src/datastore/Makefile.am
gnunet/src/dht/Makefile.am
gnunet/src/dns/Makefile.am
gnunet/src/dv/Makefile.am
gnunet/src/env/Makefile.am
gnunet/src/experimentation/Makefile.am
gnunet/src/fragmentation/Makefile.am
gnunet/src/fs/Makefile.am
gnunet/src/gns/Makefile.am
gnunet/src/gnsrecord/Makefile.am
gnunet/src/hello/Makefile.am
gnunet/src/hostlist/Makefile.am
gnunet/src/identity/Makefile.am
gnunet/src/include/gnunet_bandwidth_lib.h
gnunet/src/integration-tests/Makefile.am
gnunet/src/mesh/Makefile.am
gnunet/src/multicast/Makefile.am
gnunet/src/namecache/Makefile.am
gnunet/src/namestore/Makefile.am
gnunet/src/nat/Makefile.am
gnunet/src/nse/Makefile.am
gnunet/src/peerinfo-tool/Makefile.am
gnunet/src/peerinfo/Makefile.am
gnunet/src/psyc/Makefile.am
gnunet/src/psycstore/Makefile.am
gnunet/src/pt/Makefile.am
gnunet/src/regex/Makefile.am
gnunet/src/revocation/Makefile.am
gnunet/src/scalarproduct/Makefile.am
gnunet/src/secretsharing/Makefile.am
gnunet/src/set/Makefile.am
gnunet/src/statistics/Makefile.am
gnunet/src/template/Makefile.am
gnunet/src/testbed/Makefile.am
gnunet/src/testing/Makefile.am
gnunet/src/topology/Makefile.am
gnunet/src/transport/Makefile.am
gnunet/src/tun/Makefile.am
gnunet/src/util/Makefile.am
gnunet/src/util/configuration.c
gnunet/src/util/os_installation.c
gnunet/src/util/test_resolver_api.c
Log:
fix #3284: support lib/MULTIARCH/ paths in installation, use address@hidden@ so
that we can extract the value of MULTIARCH during 'make check'
Modified: gnunet/contrib/Makefile.am
===================================================================
--- gnunet/contrib/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/contrib/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -83,7 +83,7 @@
test_gnunet_prefix
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/po/POTFILES.in 2014-01-30 14:47:20 UTC (rev 32119)
@@ -353,6 +353,7 @@
src/util/crypto_hkdf.c
src/util/crypto_kdf.c
src/util/crypto_mpi.c
+src/util/crypto_paillier.c
src/util/crypto_random.c
src/util/crypto_symmetric.c
src/util/disk.c
Modified: gnunet/src/arm/Makefile.am
===================================================================
--- gnunet/src/arm/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/arm/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -72,7 +72,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
endif
Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/ats/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -145,7 +145,7 @@
$(TESTING_TESTS)
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/ats-tests/Makefile.am
===================================================================
--- gnunet/src/ats-tests/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/ats-tests/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -45,7 +45,7 @@
$(TESTING_TESTS)
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/consensus/Makefile.am
===================================================================
--- gnunet/src/consensus/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/consensus/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -77,7 +77,7 @@
test_consensus_api
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/conversation/Makefile.am
===================================================================
--- gnunet/src/conversation/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/conversation/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -94,7 +94,7 @@
$(AUDIO_HELPER_RECD) \
$(AUDIO_HELPER_PLAY)
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(AUDIO_TESTS)
if BUILD_PULSE_HELPERS
Modified: gnunet/src/core/Makefile.am
===================================================================
--- gnunet/src/core/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/core/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -73,7 +73,7 @@
$(TESTING_TESTS)
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/datacache/Makefile.am
===================================================================
--- gnunet/src/datacache/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/datacache/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -122,7 +122,7 @@
$(POSTGRES_TESTS)
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/datastore/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -170,7 +170,7 @@
$(POSTGRES_TESTS)
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/dht/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -158,7 +158,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = test_dht_api $(check_SCRIPTS) \
test_dht_twopeer \
test_dht_line \
Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/dns/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -115,7 +115,7 @@
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
endif
Modified: gnunet/src/dv/Makefile.am
===================================================================
--- gnunet/src/dv/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/dv/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -76,7 +76,7 @@
endif
if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/env/Makefile.am
===================================================================
--- gnunet/src/env/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/env/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -32,7 +32,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/experimentation/Makefile.am
===================================================================
--- gnunet/src/experimentation/Makefile.am 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet/src/experimentation/Makefile.am 2014-01-30 14:47:20 UTC (rev
32119)
@@ -25,7 +25,7 @@
$(TEXT_EXP_CLIQUE)
if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
$(TEXT_EXP_CLIQUE)
endif
Modified: gnunet/src/fragmentation/Makefile.am
===================================================================
--- gnunet/src/fragmentation/Makefile.am 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet/src/fragmentation/Makefile.am 2014-01-30 14:47:20 UTC (rev
32119)
@@ -25,7 +25,7 @@
test_fragmentation
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/fs/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -279,7 +279,7 @@
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;\
+TESTS_ENVIRONMENT=export address@hidden@;\
export address@hidden@/bin:$$PATH;\
$(MONKEY)
TESTS = \
Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/gns/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -277,7 +277,7 @@
if ENABLE_TEST_RUN
if HAVE_SQLITE
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_SCRIPTS)
endif
endif
Modified: gnunet/src/gnsrecord/Makefile.am
===================================================================
--- gnunet/src/gnsrecord/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/gnsrecord/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -21,7 +21,7 @@
test_gnsrecord_block_expiration
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
$(check_PROGRAMS) \
$(check_SCRIPTS)
Modified: gnunet/src/hello/Makefile.am
===================================================================
--- gnunet/src/hello/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/hello/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -28,7 +28,7 @@
test_friend_hello
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/hostlist/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -48,7 +48,7 @@
if HAVE_MHD
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
test_gnunet_daemon_hostlist \
test_gnunet_daemon_hostlist_reconnect \
Modified: gnunet/src/identity/Makefile.am
===================================================================
--- gnunet/src/identity/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/identity/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -68,7 +68,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/include/gnunet_bandwidth_lib.h
===================================================================
--- gnunet/src/include/gnunet_bandwidth_lib.h 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet/src/include/gnunet_bandwidth_lib.h 2014-01-30 14:47:20 UTC (rev
32119)
@@ -94,7 +94,7 @@
/**
* Maximum number of seconds over which bandwidth may "accumulate".
* Note that additionally, we also always allow at least
- * GNUNET_SERVER_MAX_MESSAGE_SIZE to accumulate.
+ * #GNUNET_SERVER_MAX_MESSAGE_SIZE to accumulate.
*/
uint32_t max_carry_s__;
};
Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet/src/integration-tests/Makefile.am 2014-01-30 14:47:20 UTC (rev
32119)
@@ -26,7 +26,7 @@
if HAVE_MHD
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
$(check_SCRIPTS)
endif
Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/mesh/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -184,7 +184,7 @@
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
$(check_PROGRAMS)
endif
Modified: gnunet/src/multicast/Makefile.am
===================================================================
--- gnunet/src/multicast/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/multicast/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -51,7 +51,7 @@
test_multicast_api
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/namecache/Makefile.am
===================================================================
--- gnunet/src/namecache/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/namecache/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -47,7 +47,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
$(check_PROGRAMS)
endif
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/namestore/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -63,7 +63,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
$(check_PROGRAMS) \
$(check_SCRIPTS)
Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/nat/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -80,7 +80,7 @@
test_nat_test
if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/nse/Makefile.am
===================================================================
--- gnunet/src/nse/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/nse/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -80,7 +80,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/peerinfo/Makefile.am
===================================================================
--- gnunet/src/peerinfo/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/peerinfo/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -57,7 +57,7 @@
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/peerinfo-tool/Makefile.am
===================================================================
--- gnunet/src/peerinfo-tool/Makefile.am 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet/src/peerinfo-tool/Makefile.am 2014-01-30 14:47:20 UTC (rev
32119)
@@ -29,7 +29,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_SCRIPTS)
endif
Modified: gnunet/src/psyc/Makefile.am
===================================================================
--- gnunet/src/psyc/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/psyc/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -59,7 +59,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/psycstore/Makefile.am
===================================================================
--- gnunet/src/psycstore/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/psycstore/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -81,7 +81,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/pt/Makefile.am
===================================================================
--- gnunet/src/pt/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/pt/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -57,7 +57,7 @@
check_PROGRAMS = $(VPN_TEST)
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/regex/Makefile.am
===================================================================
--- gnunet/src/regex/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/regex/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -170,7 +170,7 @@
test_regex_api
if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/revocation/Makefile.am
===================================================================
--- gnunet/src/revocation/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/revocation/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -74,7 +74,7 @@
test_local_revocation.py
if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
$(check_SCRIPTS) \
$(check_PROGRAMS)
Modified: gnunet/src/scalarproduct/Makefile.am
===================================================================
--- gnunet/src/scalarproduct/Makefile.am 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet/src/scalarproduct/Makefile.am 2014-01-30 14:47:20 UTC (rev
32119)
@@ -67,6 +67,6 @@
test_scalarproduct_negativezero.sh
if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_SCRIPTS)
endif
Modified: gnunet/src/secretsharing/Makefile.am
===================================================================
--- gnunet/src/secretsharing/Makefile.am 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet/src/secretsharing/Makefile.am 2014-01-30 14:47:20 UTC (rev
32119)
@@ -63,7 +63,7 @@
test_secretsharing_api
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/set/Makefile.am
===================================================================
--- gnunet/src/set/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/set/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -70,7 +70,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/statistics/Makefile.am
===================================================================
--- gnunet/src/statistics/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/statistics/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -58,7 +58,7 @@
test_statistics_api_watch_zero_value
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
endif
Modified: gnunet/src/template/Makefile.am
===================================================================
--- gnunet/src/template/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/template/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -38,7 +38,7 @@
test_template_api
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/testbed/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -193,7 +193,7 @@
$(underlay_testcases)
if ENABLE_TEST_RUN
- TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+ TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
test_testbed_api \
test_testbed_logger_api \
Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/testing/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -57,7 +57,7 @@
test_testing_sharedservices
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
test_testing_portreservation \
test_testing_peerstartup \
Modified: gnunet/src/topology/Makefile.am
===================================================================
--- gnunet/src/topology/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/topology/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -46,7 +46,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/transport/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -440,7 +440,7 @@
endif
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = \
test_transport_testing_startstop \
test_transport_testing_restart \
Modified: gnunet/src/tun/Makefile.am
===================================================================
--- gnunet/src/tun/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/tun/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -27,7 +27,7 @@
test_regex
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/util/Makefile.am 2014-01-30 14:47:20 UTC (rev 32119)
@@ -279,7 +279,7 @@
test_common_logging_runtime_loglevels
if ENABLE_TEST_RUN
-TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
+TESTS_ENVIRONMENT=export address@hidden@;export address@hidden@/bin:$$PATH;
TESTS = $(check_PROGRAMS)
endif
Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/util/configuration.c 2014-01-30 14:47:20 UTC (rev 32119)
@@ -1632,7 +1632,7 @@
char *ipath;
ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
- if (ipath == NULL)
+ if (NULL == ipath)
return GNUNET_SYSERR;
baseconfig = NULL;
GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
@@ -1644,7 +1644,7 @@
return GNUNET_SYSERR; /* no configuration at all found */
}
GNUNET_free (baseconfig);
- if ((filename != NULL) &&
+ if ((NULL != filename) &&
(GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, filename)))
{
/* specified configuration not found */
Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/util/os_installation.c 2014-01-30 14:47:20 UTC (rev 32119)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2006 Christian Grothoff (and other contributing authors)
+ (C) 2006-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -65,7 +65,7 @@
while (NULL != fgets (line, sizeof (line), f))
{
if ((1 ==
- SSCANF (line, "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%1023s",
dir)) &&
+ SSCANF (line, "%*x-%*x %*c%*c%*c%*c %*x %*2x:%*2x %*u%*[ ]%1023s",
dir)) &&
(NULL != (lgu = strstr (dir, "libgnunetutil"))))
{
lgu[0] = '\0';
@@ -101,7 +101,7 @@
lnk[size] = '\0';
while ((lnk[size] != '/') && (size > 0))
size--;
- /* test for being in lib/gnunet/libexec/ */
+ /* test for being in lib/gnunet/libexec/ or lib/MULTIARCH/gnunet/libexec */
if ( (size > strlen ("/gnunet/libexec/")) &&
(0 == strcmp ("/gnunet/libexec/",
&lnk[size - strlen ("/gnunet/libexec/")])) )
@@ -465,6 +465,8 @@
const char *dirname;
char *execpath = NULL;
char *tmp;
+ char *multiarch;
+ char *libdir;
int isbasedir;
/* if wanted, try to get the current app's bin/ */
@@ -513,6 +515,17 @@
execpath[n - 4] = '\0';
n -= 4;
}
+ multiarch = NULL;
+ if (NULL != (libdir = strstr (execpath, "/lib/")))
+ {
+ /* test for multi-arch path of the form "PREFIX/lib/MULTIARCH/";
+ here we need to re-add 'multiarch' to lib and libexec paths later! */
+ multiarch = &libdir[5];
+ if (NULL == strchr (multiarch, '/'))
+ libdir[0] = '\0'; /* Debian multiarch format, cut of from 'execpath' but
preserve in multicarch */
+ else
+ multiarch = NULL; /* maybe not, multiarch still has a '/', which is not
OK */
+ }
/* in case this was a directory named foo-bin, remove "foo-" */
while ((n > 1) && (execpath[n - 1] == DIR_SEPARATOR))
execpath[--n] = '\0';
@@ -530,29 +543,48 @@
{
dirname =
DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (4 == sizeof (void *)) )
+ GNUNET_asprintf (&tmp,
+ "%s%s%s",
+ execpath,
+ dirname,
+ (NULL != multiarch) ? multiarch : "");
+ if (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES))
{
- GNUNET_free (tmp);
+ GNUNET_free (execpath);
+ return tmp;
+ }
+ GNUNET_free (tmp);
+ tmp = NULL;
+ if (4 == sizeof (void *))
+ {
dirname =
DIR_SEPARATOR_STR "lib32" DIR_SEPARATOR_STR "gnunet"
DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (8 == sizeof (void *)) )
+ if (8 == sizeof (void *))
{
dirname =
DIR_SEPARATOR_STR "lib64" DIR_SEPARATOR_STR "gnunet"
DIR_SEPARATOR_STR;
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
+
+ if ( (NULL != tmp) &&
+ (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) )
+ {
+ GNUNET_free (execpath);
+ return tmp;
+ }
GNUNET_free (tmp);
}
- else
- dirname = DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR;
+ dirname = DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR;
break;
case GNUNET_OS_IPK_DATADIR:
dirname =
@@ -575,42 +607,63 @@
if (isbasedir)
{
dirname =
- DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR \
- "libexec" DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (4 == sizeof (void *)) )
+ DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR "libexec"
DIR_SEPARATOR_STR;
+ GNUNET_asprintf (&tmp,
+ "%s%s%s%s",
+ execpath,
+ DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR,
+ (NULL != multiarch) ? multiarch : "",
+ dirname);
+ if (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES))
{
- GNUNET_free (tmp);
+ GNUNET_free (execpath);
+ return tmp;
+ }
+ GNUNET_free (tmp);
+ tmp = NULL;
+ if (4 == sizeof (void *))
+ {
dirname =
DIR_SEPARATOR_STR "lib32" DIR_SEPARATOR_STR "gnunet"
DIR_SEPARATOR_STR \
"libexec" DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (8 == sizeof (void *)) )
+ if (8 == sizeof (void *))
{
dirname =
DIR_SEPARATOR_STR "lib64" DIR_SEPARATOR_STR "gnunet"
DIR_SEPARATOR_STR \
"libexec" DIR_SEPARATOR_STR;
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
+ if ( (NULL != tmp) &&
+ (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) )
+ {
+ GNUNET_free (execpath);
+ return tmp;
+ }
+
GNUNET_free (tmp);
}
- else
- dirname =
- DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR \
- "libexec" DIR_SEPARATOR_STR;
+ dirname =
+ DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR \
+ "libexec" DIR_SEPARATOR_STR;
break;
default:
GNUNET_free (execpath);
return NULL;
}
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
GNUNET_free (execpath);
return tmp;
}
Modified: gnunet/src/util/test_resolver_api.c
===================================================================
--- gnunet/src/util/test_resolver_api.c 2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet/src/util/test_resolver_api.c 2014-01-30 14:47:20 UTC (rev 32119)
@@ -199,7 +199,9 @@
else
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Received invalid rootserver hostname `%s'.\n", hostname);
+ "Received invalid rootserver hostname `%s', expected `%s'\n",
+ hostname,
+ ROOTSERVER_NAME);
GNUNET_break (0);
}
}
@@ -292,11 +294,11 @@
rootserver =
gethostbyaddr (&rootserver_addr, sizeof (rootserver_addr), AF_INET);
- if (rootserver == NULL)
+ if (NULL == rootserver)
{
/* Error: resolving IP addresses does not work */
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("gethostbyaddr() could not lookup hostname: %s\n"),
+ "gethostbyaddr() could not lookup hostname: %s\n",
hstrerror (h_errno));
GNUNET_break (0);
}
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
2014-01-30 14:37:36 UTC (rev 32118)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_about_window.glade
2014-01-30 14:47:20 UTC (rev 32119)
@@ -91,7 +91,7 @@
<object class="GtkLabel" id="about_name_version_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">GNUnet-Peerinfo-GTK r32068</property>
+ <property name="label">GNUnet-Peerinfo-GTK 0.9.5</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="200"/>
Modified: gnunet-gtk/src/lib/os_installation.c
===================================================================
--- gnunet-gtk/src/lib/os_installation.c 2014-01-30 14:37:36 UTC (rev
32118)
+++ gnunet-gtk/src/lib/os_installation.c 2014-01-30 14:47:20 UTC (rev
32119)
@@ -58,7 +58,7 @@
while (NULL != fgets (line, sizeof (line), f))
{
if ((1 ==
- sscanf (line, "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%s", dir))
&&
+ sscanf (line, "%*x-%*x %*c%*c%*c%*c %*x %*2x:%*2x %*u%*[ ]%s", dir))
&&
(NULL != (lgu = strstr (dir, "libgnunetgtk.so"))))
{
lgu[0] = '\0';
@@ -94,7 +94,7 @@
lnk[size] = '\0';
while ((lnk[size] != '/') && (size > 0))
size--;
- /* test for being in lib/gnunet/libexec/ */
+ /* test for being in lib/gnunet/libexec/ or lib/MULTIARCH/gnunet/libexec */
if ( (size > strlen ("/gnunet/libexec/")) &&
(0 == strcmp ("/gnunet/libexec/",
&lnk[size - strlen ("/gnunet/libexec/")])) )
@@ -407,9 +407,9 @@
return ret;
/* other attempts here */
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Could not determine installation path for %s. Set `%s'
environment variable.\n"),
- "gnunet-gtk", "GNUNET_GTK_PREFIX");
+ _("Could not determine installation path for %s. Set `%s'
environment variable.\n"),
+ "gnunet-gtk",
+ "GNUNET_GTK_PREFIX");
return NULL;
}
@@ -427,17 +427,17 @@
ret = NULL;
#if LINUX
ret = get_path_from_proc_exe ();
- if (ret != NULL)
+ if (NULL != ret)
return ret;
#endif
#if WINDOWS
ret = get_path_from_module_filename ();
- if (ret != NULL)
+ if (NULL != ret)
return ret;
#endif
#if DARWIN
ret = get_path_from_NSGetExecutablePath ();
- if (ret != NULL)
+ if (NULL != ret)
return ret;
#endif
/* other attempts here */
@@ -448,7 +448,7 @@
/**
* @brief get the path to a specific GNUnet installation directory or,
- * with GNUNET_IPK_SELF_PREFIX, the current running apps installation directory
+ * with #GNUNET_OS_IPK_SELF_PREFIX, the current running apps installation
directory
* @author Milan
* @return a pointer to the dir path (to be freed by the caller)
*/
@@ -459,6 +459,8 @@
const char *dirname;
char *execpath = NULL;
char *tmp;
+ char *multiarch;
+ char *libdir;
int isbasedir;
/* if wanted, try to get the current app's bin/ */
@@ -467,46 +469,57 @@
/* try to get GNUnet's bin/ or lib/, or if previous was unsuccessful some
* guess for the current app */
- if (execpath == NULL)
+ if (NULL == execpath)
execpath = os_get_gnunet_path ();
if (NULL == execpath)
return NULL;
n = strlen (execpath);
- if (n == 0)
+ if (0 == n)
{
/* should never happen, but better safe than sorry */
GNUNET_free (execpath);
return NULL;
}
/* remove filename itself */
- while ((n > 1) && (execpath[n - 1] == DIR_SEPARATOR))
+ while ((n > 1) && (DIR_SEPARATOR == execpath[n - 1]))
execpath[--n] = '\0';
isbasedir = 1;
- if ((n > 5) &&
- ((0 == strcasecmp (&execpath[n - 5], "lib32")) ||
- (0 == strcasecmp (&execpath[n - 5], "lib64"))))
+ if ((n > 6) &&
+ ((0 == strcasecmp (&execpath[n - 6], "/lib32")) ||
+ (0 == strcasecmp (&execpath[n - 6], "/lib64"))))
{
if ( (GNUNET_OS_IPK_LIBDIR != dirkind) &&
(GNUNET_OS_IPK_LIBEXECDIR != dirkind) )
{
/* strip '/lib32' or '/lib64' */
- execpath[n - 5] = '\0';
- n -= 5;
+ execpath[n - 6] = '\0';
+ n -= 6;
}
else
isbasedir = 0;
}
- else if ((n > 3) &&
- ((0 == strcasecmp (&execpath[n - 3], "bin")) ||
- (0 == strcasecmp (&execpath[n - 3], "lib"))))
+ else if ((n > 4) &&
+ ((0 == strcasecmp (&execpath[n - 4], "/bin")) ||
+ (0 == strcasecmp (&execpath[n - 4], "/lib"))))
{
/* strip '/bin' or '/lib' */
- execpath[n - 3] = '\0';
- n -= 3;
+ execpath[n - 4] = '\0';
+ n -= 4;
}
+ multiarch = NULL;
+ if (NULL != (libdir = strstr (execpath, "/lib/")))
+ {
+ /* test for multi-arch path of the form "PREFIX/lib/MULTIARCH/";
+ here we need to re-add 'multiarch' to lib and libexec paths later! */
+ multiarch = &libdir[5];
+ if (NULL == strchr (multiarch, '/'))
+ libdir[0] = '\0'; /* Debian multiarch format, cut of from 'execpath' but
preserve in multicarch */
+ else
+ multiarch = NULL; /* maybe not, multiarch still has a '/', which is not
OK */
+ }
/* in case this was a directory named foo-bin, remove "foo-" */
while ((n > 1) && (execpath[n - 1] == DIR_SEPARATOR))
execpath[--n] = '\0';
@@ -523,84 +536,128 @@
if (isbasedir)
{
dirname =
- DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (4 == sizeof (void *)) )
+ DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "libexec"
DIR_SEPARATOR_STR;
+ GNUNET_asprintf (&tmp,
+ "%s%s%s%s",
+ execpath,
+ DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR,
+ (NULL != multiarch) ? multiarch : ""
+ dirname);
+ if (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES))
{
- GNUNET_free (tmp);
+ GNUNET_free (execpath);
+ return tmp;
+ }
+ GNUNET_free (tmp);
+ NULL == tmp;
+ if (4 == sizeof (void *))
+ {
dirname =
DIR_SEPARATOR_STR "lib32" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (8 == sizeof (void *)) )
+ if (8 == sizeof (void *))
{
dirname =
DIR_SEPARATOR_STR "lib64" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
+ if ( (NULL != tmp) &&
+ (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) )
+ {
+ GNUNET_free (execpath);
+ return tmp;
+ }
GNUNET_free (tmp);
}
- else
- dirname = DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR;
+ dirname = DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR;
break;
case GNUNET_OS_IPK_DATADIR:
dirname =
- DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet-gtk"
- DIR_SEPARATOR_STR;
+ DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
break;
+ case GNUNET_OS_IPK_LOCALEDIR:
+ dirname =
+ DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "locale" DIR_SEPARATOR_STR;
+ break;
case GNUNET_OS_IPK_ICONDIR:
dirname =
DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "icons" DIR_SEPARATOR_STR;
break;
- case GNUNET_OS_IPK_LOCALEDIR:
+ case GNUNET_OS_IPK_DOCDIR:
dirname =
- DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "locale" DIR_SEPARATOR_STR;
+ DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "doc" DIR_SEPARATOR_STR \
+ "gnunet" DIR_SEPARATOR_STR;
break;
case GNUNET_OS_IPK_LIBEXECDIR:
if (isbasedir)
{
dirname =
- DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR \
- "libexec" DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (4 == sizeof (void *)) )
+ DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "libexec"
DIR_SEPARATOR_STR;
+ GNUNET_asprintf (&tmp,
+ "%s%s%s%s",
+ execpath,
+ DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR,
+ (NULL != multiarch) ? multiarch : "",
+ dirname);
+ if (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES))
{
- GNUNET_free (tmp);
+ GNUNET_free (execpath);
+ return tmp;
+ }
+ GNUNET_free (tmp);
+ tmp = NULL;
+ if (4 == sizeof (void *))
+ {
dirname =
DIR_SEPARATOR_STR "lib32" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR \
"libexec" DIR_SEPARATOR_STR;
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
- if ( (GNUNET_YES !=
- GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
- (8 == sizeof (void *)) )
+ if (8 == sizeof (void *))
{
dirname =
DIR_SEPARATOR_STR "lib64" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR \
"libexec" DIR_SEPARATOR_STR;
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
}
+ if ( (NULL != tmp) &&
+ (GNUNET_YES ==
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) )
+ {
+ GNUNET_free (execpath);
+ return tmp;
+ }
+
GNUNET_free (tmp);
}
- else
- dirname =
- DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR \
- "libexec" DIR_SEPARATOR_STR;
+ dirname =
+ DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR \
+ "libexec" DIR_SEPARATOR_STR;
break;
default:
GNUNET_free (execpath);
return NULL;
}
- tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
- sprintf (tmp, "%s%s", execpath, dirname);
+ GNUNET_asprintf (&tmp,
+ "%s%s",
+ execpath,
+ dirname);
GNUNET_free (execpath);
return tmp;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32119 - gnunet/contrib gnunet/po gnunet/src/arm gnunet/src/ats gnunet/src/ats-tests gnunet/src/consensus gnunet/src/conversation gnunet/src/core gnunet/src/datacache gnunet/src/datastore gnunet/src/dht gnunet/src/dns gnunet/src/dv gnunet/src/env gnunet/src/experimentation gnunet/src/fragmentation gnunet/src/fs gnunet/src/gns gnunet/src/gnsrecord gnunet/src/hello gnunet/src/hostlist gnunet/src/identity gnunet/src/include gnunet/src/integration-tests gnunet/src/mesh gnunet/src/multicast gnunet/src/namecache gnunet/src/namestore gnunet/src/nat gnunet/src/nse gnunet/src/peerinfo gnunet/src/peerinfo-tool gnunet/src/psyc gnunet/src/psycstore gnunet/src/pt gnunet/src/regex gnunet/src/revocation gnunet/src/scalarproduct gnunet/src/secretsharing gnunet/src/set gnunet/src/statistics gnunet/src/template gnunet/src/testbed gnunet/src/testing gnunet/src/topology gnunet/src/transport gnunet/src/tun gnunet/src/util gnunet-gtk/contrib gnunet-gtk/src/lib,
gnunet <=