From 9df183774b9b2b4cef897cb4f66240bb8c2198ec Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 13 Oct 2016 07:44:31 +0000 Subject: [PATCH] fix build for Taler wallet --- configure.ac | 9 ++++- po/POTFILES.in | 3 ++ src/util/common_logging.c | 72 +++++++++++++++++++++++++++++--------- src/util/test_crypto_rsa.c | 4 +-- 4 files changed, 68 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 6697db2c6..4453acff2 100644 --- a/configure.ac +++ b/configure.ac @@ -567,7 +567,14 @@ AC_ARG_ENABLE([taler-wallet], [taler_only=${enableval}], [taler_only=no]) AC_MSG_RESULT($taler_only) -AM_CONDITIONAL([TALER_ONLY], [test "x$taler_only" = "xyes"]) +if test "x$taler_only" = "xyes" +then + AM_CONDITIONAL([TALER_ONLY],true) + AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet]) +else + AM_CONDITIONAL([TALER_ONLY],false) + AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation]) +fi # test for libextractor extractor=0 diff --git a/po/POTFILES.in b/po/POTFILES.in index 3fe957b95..adecca976 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -174,6 +174,7 @@ src/gns/gnunet-gns-proxy.c src/gns/gnunet-service-gns.c src/gns/gnunet-service-gns_interceptor.c src/gns/gnunet-service-gns_resolver.c +src/gns/gnunet-service-gns_reverser.c src/gns/gnunet-service-gns_shorten.c src/gns/nss/nss_gns.c src/gns/nss/nss_gns_query.c @@ -271,6 +272,7 @@ src/psyc/gnunet-service-psyc.c src/psyc/psyc_api.c src/psycstore/gnunet-service-psycstore.c src/psycstore/plugin_psycstore_mysql.c +src/psycstore/plugin_psycstore_postgres.c src/psycstore/plugin_psycstore_sqlite.c src/psycstore/psycstore_api.c src/psycutil/psyc_env.c @@ -412,6 +414,7 @@ src/tun/tun.c src/util/bandwidth.c src/util/bio.c src/util/client.c +src/util/client_new.c src/util/common_allocation.c src/util/common_endian.c src/util/common_logging.c diff --git a/src/util/common_logging.c b/src/util/common_logging.c index a391d0b9e..5989db00c 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -294,6 +294,7 @@ GNUNET_abort_ () } +#if ! TALER_WALLET_ONLY /** * Rotate logs, deleting the oldest log. * @@ -407,6 +408,7 @@ setup_log_file (const struct tm *tm) GNUNET_stderr = altlog; return GNUNET_OK; } +#endif /** @@ -691,8 +693,6 @@ GNUNET_log_setup (const char *comp, const char *logfile) { const char *env_logfile; - const struct tm *tm; - time_t t; min_level = get_type (loglevel); #if !defined(GNUNET_CULL_LOGGING) @@ -715,9 +715,20 @@ GNUNET_log_setup (const char *comp, log_file_name = GNUNET_STRINGS_filename_expand (logfile); if (NULL == log_file_name) return GNUNET_SYSERR; - t = time (NULL); - tm = gmtime (&t); - return setup_log_file (tm); +#if TALER_WALLET_ONLY + /* log file option not allowed for wallet logic */ + GNUNET_assert (NULL == logfile); + return GNUNET_OK; +#else + { + time_t t; + const struct tm *tm; + + t = time (NULL); + tm = gmtime (&t); + return setup_log_file (tm); + } +#endif } @@ -806,7 +817,7 @@ output_message (enum GNUNET_ErrorType kind, * for end users while still having the power of the * logging engine for developer needs. So ideally this * is what it should look like when CLI tools are used - * interactively, yet the same message shouldn't look + * interactively, yet the same message shouldn't look * this way if the output is going to logfiles or robots * instead. Is this the right place to do this? --lynX */ @@ -848,7 +859,8 @@ flush_bulk (const char *datestr) char *last; const char *ft; - if ((0 == last_bulk_time.abs_value_us) || (0 == last_bulk_repeat)) + if ( (0 == last_bulk_time.abs_value_us) || + (0 == last_bulk_repeat) ) return; rev = 0; last = memchr (last_bulk, '\0', BULK_TRACK_SIZE); @@ -933,10 +945,15 @@ mylog (enum GNUNET_ErrorType kind, va_list vacp; va_copy (vacp, va); - size = VSNPRINTF (NULL, 0, message, vacp) + 1; + size = VSNPRINTF (NULL, + 0, + message, + vacp) + 1; GNUNET_assert (0 != size); va_end (vacp); - memset (date, 0, DATE_STR_SIZE); + memset (date, + 0, + DATE_STR_SIZE); { char buf[size]; long long offset; @@ -956,8 +973,13 @@ mylog (enum GNUNET_ErrorType kind, } else { - strftime (date2, DATE_STR_SIZE, "%b %d %H:%M:%S-%%020llu", tmptr); - snprintf (date, sizeof (date), date2, + strftime (date2, + DATE_STR_SIZE, + "%b %d %H:%M:%S-%%020llu", + tmptr); + snprintf (date, + sizeof (date), + date2, (long long) (pc.QuadPart / (performance_frequency.QuadPart / 1000))); } @@ -992,17 +1014,26 @@ mylog (enum GNUNET_ErrorType kind, tmptr = localtime (&timeofday.tv_sec); if (NULL == tmptr) { - strcpy (date, "localtime error"); + strcpy (date, + "localtime error"); } else { - strftime (date2, DATE_STR_SIZE, "%b %d %H:%M:%S-%%06u", tmptr); - snprintf (date, sizeof (date), date2, timeofday.tv_usec); + strftime (date2, + DATE_STR_SIZE, + "%b %d %H:%M:%S-%%06u", + tmptr); + snprintf (date, + sizeof (date), + date2, + timeofday.tv_usec); } #endif VSNPRINTF (buf, size, message, va); +#if ! TALER_WALLET_ONLY if (NULL != tmptr) (void) setup_log_file (tmptr); +#endif if ((0 != (kind & GNUNET_ERROR_TYPE_BULK)) && (0 != last_bulk_time.abs_value_us) && (0 == strncmp (buf, last_bulk, sizeof (last_bulk)))) @@ -1015,12 +1046,19 @@ mylog (enum GNUNET_ErrorType kind, return; } flush_bulk (date); - strncpy (last_bulk, buf, sizeof (last_bulk)); + strncpy (last_bulk, + buf, + sizeof (last_bulk)); last_bulk_repeat = 0; last_bulk_kind = kind; last_bulk_time = GNUNET_TIME_absolute_get (); - strncpy (last_bulk_comp, comp, COMP_TRACK_SIZE); - output_message (kind, comp, date, buf); + strncpy (last_bulk_comp, + comp, + COMP_TRACK_SIZE); + output_message (kind, + comp, + date, + buf); } } diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c index 489dc2cf1..c64c0acf9 100644 --- a/src/util/test_crypto_rsa.c +++ b/src/util/test_crypto_rsa.c @@ -11,7 +11,7 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, If not, see + GNUnet; see the file COPYING. If not, If not, see */ /** @@ -112,7 +112,7 @@ main (int argc, pub); GNUNET_CRYPTO_rsa_signature_free (bsig); GNUNET_assert (GNUNET_OK == - GNUNET_CRYPTO_rsa_verify (&hash, sig, pub)); + GNUNET_CRYPTO_rsa_verify (&hash, sig, pub)); GNUNET_CRYPTO_rsa_signature_free (sig); GNUNET_CRYPTO_rsa_signature_free (sig_copy); GNUNET_CRYPTO_rsa_private_key_free (priv); -- 2.25.1